diff --git a/test/functional/pdo_sqlsrv/MsCommon_mid-refactor.inc b/test/functional/pdo_sqlsrv/MsCommon_mid-refactor.inc
index cf2ff605..d327d859 100644
--- a/test/functional/pdo_sqlsrv/MsCommon_mid-refactor.inc
+++ b/test/functional/pdo_sqlsrv/MsCommon_mid-refactor.inc
@@ -624,6 +624,33 @@ function IsDaasMode()
     return ($daasMode ? true : false);
 }
 
+function isAzureDW()
+{
+    // Check if running Azure Data Warehouse
+    // For details, https://docs.microsoft.com/sql/t-sql/functions/serverproperty-transact-sql
+    try {
+        $conn = connect();
+
+        // Check if running Azure Data Warehouse
+        // For details, https://docs.microsoft.com/sql/t-sql/functions/serverproperty-transact-sql
+        $tsql = "SELECT SERVERPROPERTY ('edition'), SERVERPROPERTY ('EngineEdition')";
+        $stmt = $conn->query($tsql);
+
+        $result = $stmt->fetch(PDO::FETCH_NUM);
+        $edition = $result[0];
+        $engEd = intval($result[1]);
+
+        if ($edition == "SQL Azure" && $engEd == 6) {
+            return true;
+        } else {
+            return false;
+        }
+    } catch (Exception $e) {
+        echo $e->getMessage();
+        die("skip Failed to connect or could not fetch edition info.");
+    }
+}
+
 function FatalError($errorMsg)
 {
     if (!IsPdoMode()) {
diff --git a/test/functional/pdo_sqlsrv/PDO81_MemoryCheck.phpt b/test/functional/pdo_sqlsrv/PDO81_MemoryCheck.phpt
index 9fc7cd95..5513290b 100644
--- a/test/functional/pdo_sqlsrv/PDO81_MemoryCheck.phpt
+++ b/test/functional/pdo_sqlsrv/PDO81_MemoryCheck.phpt
@@ -6,7 +6,7 @@ emalloc (which only allocate memory in the memory space allocated for the PHP pr
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif_azure.inc'); ?>
+<?php require('skipif_azure_dw.inc'); ?>
 --FILE--
 <?php
 include 'MsCommon.inc';
diff --git a/test/functional/pdo_sqlsrv/pdoStatement_bindParam_output_emulate_prepare.phpt b/test/functional/pdo_sqlsrv/pdoStatement_bindParam_output_emulate_prepare.phpt
index 3a6f6ece..35f4197f 100644
--- a/test/functional/pdo_sqlsrv/pdoStatement_bindParam_output_emulate_prepare.phpt
+++ b/test/functional/pdo_sqlsrv/pdoStatement_bindParam_output_emulate_prepare.phpt
@@ -2,6 +2,7 @@
 Tests error returned when binding output parameter with emulate prepare
 --SKIPIF--
 <?php require_once('skipif_mid-refactor.inc'); ?>
+<?php require('skipif_azure_dw.inc'); ?>
 --FILE--
 <?php
 require_once("MsCommon_mid-refactor.inc");
diff --git a/test/functional/pdo_sqlsrv/pdo_574_next_rowset.phpt b/test/functional/pdo_sqlsrv/pdo_574_next_rowset.phpt
index d4c0e811..5ae6c67b 100644
--- a/test/functional/pdo_sqlsrv/pdo_574_next_rowset.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_574_next_rowset.phpt
@@ -6,6 +6,7 @@ Verifies the functionality of PDOStatement nextRowset
 PHPT_EXEC=true
 --SKIPIF--
 <?php require('skipif_mid-refactor.inc'); ?>
+<?php require('skipif_azure_dw.inc'); ?>
 --FILE--
 <?php
 
diff --git a/test/functional/pdo_sqlsrv/pdo_azure_ad_authentication.phpt b/test/functional/pdo_sqlsrv/pdo_azure_ad_authentication.phpt
index 0aea766f..e2d85dd4 100644
--- a/test/functional/pdo_sqlsrv/pdo_azure_ad_authentication.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_azure_ad_authentication.phpt
@@ -12,30 +12,27 @@ require_once("MsSetup.inc");
 //
 $connectionInfo = "Database = $databaseName; Authentication = SqlPassword;  TrustServerCertificate = true;";
 
-try
-{
-    $conn = new PDO( "sqlsrv:server = $server ; $connectionInfo", $uid, $pwd );
+try {
+    $conn = new PDO("sqlsrv:server = $server ; $connectionInfo", $uid, $pwd);
     echo "Connected successfully with Authentication=SqlPassword.\n";
-}
-catch( PDOException $e )
-{
+} catch (PDOException $e) {
     echo "Could not connect with Authentication=SqlPassword.\n";
-    print_r( $e->getMessage() );
+    print_r($e->getMessage());
     echo "\n";
 }
 
-$stmt = $conn->query( "SELECT count(*) FROM cd_info" );
-if ( $stmt === false )
-{
+// For details, https://docs.microsoft.com/sql/t-sql/functions/serverproperty-transact-sql
+$conn->setAttribute(PDO::SQLSRV_ATTR_FETCHES_NUMERIC_TYPE, true);
+$stmt = $conn->query("SELECT SERVERPROPERTY('EngineEdition')");
+if ($stmt === false) {
     echo "Query failed.\n";
-}
-else
-{
-    $result = $stmt->fetch();
-    var_dump( $result );
+} else {
+    $result = $stmt->fetch(PDO::FETCH_NUM);
+    $edition = $result[0];
+    var_dump($edition);
 }
 
-$conn = null;
+unset($conn);
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 // Test Azure AD with integrated authentication. This should fail because
@@ -43,16 +40,13 @@ $conn = null;
 //
 $connectionInfo = "Authentication = ActiveDirectoryIntegrated; TrustServerCertificate = true;";
 
-try
-{
-    $conn = new PDO( "sqlsrv:server = $server ; $connectionInfo" );
+try {
+    $conn = new PDO("sqlsrv:server = $server ; $connectionInfo");
     echo "Connected successfully with Authentication=ActiveDirectoryIntegrated.\n";
-    $conn = null;
-}
-catch( PDOException $e )
-{
+    unset($conn);
+} catch (PDOException $e) {
     echo "Could not connect with Authentication=ActiveDirectoryIntegrated.\n";
-    print_r( $e->getMessage() );
+    print_r($e->getMessage());
     echo "\n";
 }
 
@@ -65,35 +59,24 @@ $azureDatabase = $adDatabase;
 $azureUsername = $adUser;
 $azurePassword = $adPassword;
 
-if ($azureServer != 'TARGET_AD_SERVER')
-{
+if ($azureServer != 'TARGET_AD_SERVER') {
     $connectionInfo = "Authentication = ActiveDirectoryPassword; TrustServerCertificate = false";
 
-    try
-    {
-        $conn = new PDO( "sqlsrv:server = $azureServer ; $connectionInfo", $azureUsername, $azurePassword );
+    try {
+        $conn = new PDO("sqlsrv:server = $azureServer ; $connectionInfo", $azureUsername, $azurePassword);
         echo "Connected successfully with Authentication=ActiveDirectoryPassword.\n";
-    }
-    catch( PDOException $e )
-    {
+    } catch (PDOException $e) {
         echo "Could not connect with ActiveDirectoryPassword.\n";
-        print_r( $e->getMessage() );
+        print_r($e->getMessage());
         echo "\n";
     }
-}
-else
-{
+} else {
     echo "Not testing with Authentication=ActiveDirectoryPassword.\n";
 }
 ?>
 --EXPECTF--
 Connected successfully with Authentication=SqlPassword.
-array(2) {
-  [""]=>
-  string(1) "7"
-  [0]=>
-  string(1) "7"
-}
+string(1) "%d"
 Could not connect with Authentication=ActiveDirectoryIntegrated.
 SQLSTATE[IMSSP]: Invalid option for the Authentication keyword. Only SqlPassword or ActiveDirectoryPassword is supported.
 %s with Authentication=ActiveDirectoryPassword.
diff --git a/test/functional/pdo_sqlsrv/pdo_prepare_attribute.phpt b/test/functional/pdo_sqlsrv/pdo_prepare_attribute.phpt
index d0da03e1..01774f08 100644
--- a/test/functional/pdo_sqlsrv/pdo_prepare_attribute.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_prepare_attribute.phpt
@@ -4,6 +4,7 @@ Test PDO::prepare() with PDO::ATTR_EMULATE_PREPARES.
 PHPT_EXEC=true
 --SKIPIF--
 <?php require_once('skipif_mid-refactor.inc'); ?>
+<?php require('skipif_azure_dw.inc'); ?>
 --FILE--
 <?php
 
diff --git a/test/functional/pdo_sqlsrv/skipif_azure_dw.inc b/test/functional/pdo_sqlsrv/skipif_azure_dw.inc
new file mode 100644
index 00000000..2ef1c3a1
--- /dev/null
+++ b/test/functional/pdo_sqlsrv/skipif_azure_dw.inc
@@ -0,0 +1,10 @@
+<?php
+if (!extension_loaded("pdo_sqlsrv")) {
+    die("skip Extension not loaded");
+}
+
+require_once('MsCommon_mid-refactor.inc');
+if (isAzureDW()) {
+    die("skip test not applicable in Azure Data Warehouse\n");
+}
+?>
\ No newline at end of file
diff --git a/test/functional/sqlsrv/0013.phpt b/test/functional/sqlsrv/0013.phpt
index cb2236df..6ccb4642 100644
--- a/test/functional/sqlsrv/0013.phpt
+++ b/test/functional/sqlsrv/0013.phpt
@@ -1,7 +1,7 @@
 --TEST--
 A test for a simple query
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_azure_dw.inc'); ?>
 --FILE--
 <?php
     sqlsrv_configure('WarningsReturnAsErrors', 0);
diff --git a/test/functional/sqlsrv/0022.phpt b/test/functional/sqlsrv/0022.phpt
index 97834321..91690749 100644
--- a/test/functional/sqlsrv/0022.phpt
+++ b/test/functional/sqlsrv/0022.phpt
@@ -1,7 +1,7 @@
 --TEST--
 zombied streams after sqlsrv_stmt_cancel.
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_azure_dw.inc'); ?>
 --FILE--
 <?php
     sqlsrv_configure( 'WarningsReturnAsErrors', 0 );
diff --git a/test/functional/sqlsrv/53_0021.phpt b/test/functional/sqlsrv/53_0021.phpt
index 3e60effb..8d010299 100644
--- a/test/functional/sqlsrv/53_0021.phpt
+++ b/test/functional/sqlsrv/53_0021.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test for integer, float, and datetime types vs various sql server types.
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_azure_dw.inc'); ?>
 --FILE--
 <?php
 
diff --git a/test/functional/sqlsrv/MsCommon.inc b/test/functional/sqlsrv/MsCommon.inc
index 04718dfb..eb4933b7 100644
--- a/test/functional/sqlsrv/MsCommon.inc
+++ b/test/functional/sqlsrv/MsCommon.inc
@@ -84,6 +84,28 @@ function isDaasMode()
     return ($daasMode ? true : false);
 }
 
+function isAzureDW()
+{
+    // Check if running Azure Data Warehouse
+    // For details, https://docs.microsoft.com/sql/t-sql/functions/serverproperty-transact-sql
+    $conn = connect();
+    $tsql = "SELECT SERVERPROPERTY ('edition'), SERVERPROPERTY ('EngineEdition')";
+    $stmt = sqlsrv_query($conn, $tsql);
+
+    if (sqlsrv_fetch($stmt)) {
+        $edition = sqlsrv_get_field($stmt, 0);
+        $engEd = sqlsrv_get_field($stmt, 1, SQLSRV_PHPTYPE_INT);
+        
+        if ($edition == "SQL Azure" && $engEd == 6) {
+            return true;
+        } else {
+            return false;
+        }
+    } else {
+        die("Could not fetch edition info.");
+    }
+}
+
 function startTest($testName)
 {
     if (traceMode()) {
diff --git a/test/functional/sqlsrv/TC81_MemoryCheck.phpt b/test/functional/sqlsrv/TC81_MemoryCheck.phpt
index 8de03ade..5845da21 100644
--- a/test/functional/sqlsrv/TC81_MemoryCheck.phpt
+++ b/test/functional/sqlsrv/TC81_MemoryCheck.phpt
@@ -6,8 +6,8 @@ emalloc (which only allocate memory in the memory space allocated for the PHP pr
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif_azure.inc');
-      require('skipif_versions_old.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
+<?php require('skipif_azure.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/bugfix_dataCorruption.phpt b/test/functional/sqlsrv/bugfix_dataCorruption.phpt
index b6f037e2..e79cbafc 100644
--- a/test/functional/sqlsrv/bugfix_dataCorruption.phpt
+++ b/test/functional/sqlsrv/bugfix_dataCorruption.phpt
@@ -1,7 +1,7 @@
 --TEST--
 data corruption fix.
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_azure_dw.inc'); ?>
 --FILE--
 <?php
     sqlsrv_configure( 'WarningsReturnAsErrors', 0 );
diff --git a/test/functional/sqlsrv/fix_test_168256-2.phpt b/test/functional/sqlsrv/fix_test_168256-2.phpt
index 98d72b18..086dd80a 100644
--- a/test/functional/sqlsrv/fix_test_168256-2.phpt
+++ b/test/functional/sqlsrv/fix_test_168256-2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Fix for 168256.
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_azure_dw.inc'); ?>
 --FILE--
 <?php
     sqlsrv_configure('WarningsReturnAsErrors', 0);
diff --git a/test/functional/sqlsrv/fix_test_168256.phpt b/test/functional/sqlsrv/fix_test_168256.phpt
index f4dd5053..92eb588c 100644
--- a/test/functional/sqlsrv/fix_test_168256.phpt
+++ b/test/functional/sqlsrv/fix_test_168256.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Fix for 168256.
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_azure_dw.inc'); ?>
 --FILE--
 <?php
     sqlsrv_configure('WarningsReturnAsErrors', 0);
diff --git a/test/functional/sqlsrv/fix_test_182741.phpt b/test/functional/sqlsrv/fix_test_182741.phpt
index 90cf0e24..23e89ece 100644
--- a/test/functional/sqlsrv/fix_test_182741.phpt
+++ b/test/functional/sqlsrv/fix_test_182741.phpt
@@ -2,6 +2,7 @@
 fix for 182741.
 --SKIPIF--
 <?php require('skipif_versions_old.inc'); ?>
+<?php require('skipif_azure_dw.inc'); ?>
 --FILE--
 <?php
     sqlsrv_configure('WarningsReturnAsErrors', 0);
diff --git a/test/functional/sqlsrv/skipif_azure_dw.inc b/test/functional/sqlsrv/skipif_azure_dw.inc
new file mode 100644
index 00000000..3fc1138d
--- /dev/null
+++ b/test/functional/sqlsrv/skipif_azure_dw.inc
@@ -0,0 +1,12 @@
+<?php
+
+if (!extension_loaded("sqlsrv")) {
+    die("skip extension not loaded");
+}
+
+require_once('MsCommon.inc');
+if (isAzureDW()) {
+    die("skip test not applicable in Azure Data Warehouse\n");
+}
+
+?>
\ No newline at end of file
diff --git a/test/functional/sqlsrv/sqlsrv_574_next_result.phpt b/test/functional/sqlsrv/sqlsrv_574_next_result.phpt
index c21f7178..82cb4b4e 100644
--- a/test/functional/sqlsrv/sqlsrv_574_next_result.phpt
+++ b/test/functional/sqlsrv/sqlsrv_574_next_result.phpt
@@ -6,6 +6,7 @@ Verifies the functionality of sqlsrv_next_result
 PHPT_EXEC=true
 --SKIPIF--
 <?php require('skipif_versions_old.inc'); ?>
+<?php require('skipif_azure_dw.inc'); ?>
 --FILE--
 <?php
 
diff --git a/test/functional/sqlsrv/sqlsrv_azure_ad_authentication.phpt b/test/functional/sqlsrv/sqlsrv_azure_ad_authentication.phpt
index eb1da333..af582dcb 100644
--- a/test/functional/sqlsrv/sqlsrv_azure_ad_authentication.phpt
+++ b/test/functional/sqlsrv/sqlsrv_azure_ad_authentication.phpt
@@ -13,31 +13,26 @@ require_once("MsSetup.inc");
 $connectionInfo = array( "Database"=>$databaseName, "UID"=>$uid, "PWD"=>$pwd,
                          "Authentication"=>'SqlPassword', "TrustServerCertificate"=>true);
 
-$conn = sqlsrv_connect( $server, $connectionInfo );
+$conn = sqlsrv_connect($server, $connectionInfo);
 
-if( $conn === false )
-{
+if ($conn === false) {
     echo "Could not connect with Authentication=SqlPassword.\n";
-    var_dump( sqlsrv_errors() );
-}
-else
-{
+    var_dump(sqlsrv_errors());
+} else {
     echo "Connected successfully with Authentication=SqlPassword.\n";
 }
 
-$stmt = sqlsrv_query( $conn, "SELECT count(*) FROM cd_info" );
-if ( $stmt === false )
-{
+// For details, https://docs.microsoft.com/sql/t-sql/functions/serverproperty-transact-sql
+$stmt = sqlsrv_query($conn, "SELECT SERVERPROPERTY('EngineEdition')");
+if (sqlsrv_fetch($stmt)) {
+    $edition = sqlsrv_get_field($stmt, 0);
+    var_dump($edition);
+} else {
     echo "Query failed.\n";
 }
-else
-{
-    $result = sqlsrv_fetch_array( $stmt );
-    var_dump( $result );
-}
 
-sqlsrv_free_stmt( $stmt );
-sqlsrv_close( $conn );
+sqlsrv_free_stmt($stmt);
+sqlsrv_close($conn);
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 // Test Azure AD with integrated authentication. This should fail because
@@ -45,17 +40,14 @@ sqlsrv_close( $conn );
 //
 $connectionInfo = array( "Authentication"=>"ActiveDirectoryIntegrated", "TrustServerCertificate"=>true );
 
-$conn = sqlsrv_connect( $server, $connectionInfo );
-if( $conn === false )
-{
+$conn = sqlsrv_connect($server, $connectionInfo);
+if ($conn === false) {
     echo "Could not connect with Authentication=ActiveDirectoryIntegrated.\n";
     $errors = sqlsrv_errors();
     print_r($errors[0]);
-}
-else
-{
+} else {
     echo "Connected successfully with Authentication=ActiveDirectoryIntegrated.\n";
-    sqlsrv_close( $conn );
+    sqlsrv_close($conn);
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -67,36 +59,25 @@ $azureDatabase = $adDatabase;
 $azureUsername = $adUser;
 $azurePassword = $adPassword;
 
-if ($azureServer != 'TARGET_AD_SERVER')
-{
-    $connectionInfo = array( "UID"=>$azureUsername, "PWD"=>$azurePassword, 
+if ($azureServer != 'TARGET_AD_SERVER') {
+    $connectionInfo = array( "UID"=>$azureUsername, "PWD"=>$azurePassword,
                          "Authentication"=>'ActiveDirectoryPassword',  "TrustServerCertificate"=>false );
 
-    $conn = sqlsrv_connect( $azureServer, $connectionInfo );
-    if( $conn === false )
-    {
+    $conn = sqlsrv_connect($azureServer, $connectionInfo);
+    if ($conn === false) {
         echo "Could not connect with ActiveDirectoryPassword.\n";
-        print_r( sqlsrv_errors() );
-    }
-    else
-    {
+        print_r(sqlsrv_errors());
+    } else {
         echo "Connected successfully with Authentication=ActiveDirectoryPassword.\n";
-        sqlsrv_close( $conn );
+        sqlsrv_close($conn);
     }
-}
-else
-{
+} else {
     echo "Not testing with Authentication=ActiveDirectoryPassword.\n";
 }
 ?>
 --EXPECTF--
 Connected successfully with Authentication=SqlPassword.
-array(2) {
-  [0]=>
-  int(7)
-  [""]=>
-  int(7)
-}
+string(1) "%d"
 Could not connect with Authentication=ActiveDirectoryIntegrated.
 Array
 (
diff --git a/test/functional/sqlsrv/sqlsrv_data_to_str.phpt b/test/functional/sqlsrv/sqlsrv_data_to_str.phpt
index 5f456108..08f42b26 100644
--- a/test/functional/sqlsrv/sqlsrv_data_to_str.phpt
+++ b/test/functional/sqlsrv/sqlsrv_data_to_str.phpt
@@ -1,7 +1,7 @@
 --TEST--
 large types to strings of 1MB size.
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_azure_dw.inc'); ?>
 --FILE--
 <?php
 
diff --git a/test/functional/sqlsrv/sqlsrv_get_field.phpt b/test/functional/sqlsrv/sqlsrv_get_field.phpt
index df68d4be..9247d0ba 100644
--- a/test/functional/sqlsrv/sqlsrv_get_field.phpt
+++ b/test/functional/sqlsrv/sqlsrv_get_field.phpt
@@ -1,7 +1,7 @@
 --TEST--
 integer, float, and datetime types vs various sql server types.
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_azure_dw.inc'); ?>
 --FILE--
 <?php
 
diff --git a/test/functional/sqlsrv/sqlsrv_metadata.phpt b/test/functional/sqlsrv/sqlsrv_metadata.phpt
index 7f05f3a4..79998c48 100644
--- a/test/functional/sqlsrv/sqlsrv_metadata.phpt
+++ b/test/functional/sqlsrv/sqlsrv_metadata.phpt
@@ -1,7 +1,7 @@
 --TEST--
 field metadata for all types.
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_azure_dw.inc'); ?>
 --FILE--
 <?php
     sqlsrv_configure( 'WarningsReturnAsErrors', 0 );
diff --git a/test/functional/sqlsrv/sqlsrv_readStream.phpt b/test/functional/sqlsrv/sqlsrv_readStream.phpt
index e6601829..ec87a681 100644
--- a/test/functional/sqlsrv/sqlsrv_readStream.phpt
+++ b/test/functional/sqlsrv/sqlsrv_readStream.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Read varchar(max) fields from a stream
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_azure_dw.inc'); ?>
 --FILE--
 <?php
 
diff --git a/test/functional/sqlsrv/srv_223_sqlsrv_fetch_absolute.phpt b/test/functional/sqlsrv/srv_223_sqlsrv_fetch_absolute.phpt
index 76dffa1e..21f70bbb 100644
--- a/test/functional/sqlsrv/srv_223_sqlsrv_fetch_absolute.phpt
+++ b/test/functional/sqlsrv/srv_223_sqlsrv_fetch_absolute.phpt
@@ -10,7 +10,8 @@ require_once('MsCommon.inc');
 $conn = AE\connect();
 
 // Prepare the statement
-$sql = "select * from cd_info";
+$sql = "SELECT * FROM sys.objects";
+
 $stmt = sqlsrv_prepare($conn, $sql, array(), array("Scrollable"=>SQLSRV_CURSOR_CLIENT_BUFFERED));
 if ($stmt === false) {
     printErrors();
diff --git a/test/functional/sqlsrv/test_closeConnection.phpt b/test/functional/sqlsrv/test_closeConnection.phpt
index 24c96e0d..f796bf80 100644
--- a/test/functional/sqlsrv/test_closeConnection.phpt
+++ b/test/functional/sqlsrv/test_closeConnection.phpt
@@ -1,7 +1,7 @@
 --TEST--
 using an already closed connection.
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_azure_dw.inc'); ?>
 --FILE--
 <?php
     sqlsrv_configure( 'WarningsReturnAsErrors', 0 );
diff --git a/test/functional/sqlsrv/test_fetch.phpt b/test/functional/sqlsrv/test_fetch.phpt
index 50dbd967..a3d70537 100644
--- a/test/functional/sqlsrv/test_fetch.phpt
+++ b/test/functional/sqlsrv/test_fetch.phpt
@@ -1,7 +1,7 @@
 --TEST--
 various fetch types.
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_azure_dw.inc'); ?>
 --FILE--
 <?php
 
diff --git a/test/functional/sqlsrv/test_fetch2.phpt b/test/functional/sqlsrv/test_fetch2.phpt
index 1931c992..1f545d16 100644
--- a/test/functional/sqlsrv/test_fetch2.phpt
+++ b/test/functional/sqlsrv/test_fetch2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 nameless fields return correctly in sqlsrv_fetch_array and sqlsrv_fetch_object.
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_azure_dw.inc'); ?>
 --FILE--
 <?php
 
diff --git a/test/functional/sqlsrv/test_insert_null.phpt b/test/functional/sqlsrv/test_insert_null.phpt
index e6347625..885ee5ee 100644
--- a/test/functional/sqlsrv/test_insert_null.phpt
+++ b/test/functional/sqlsrv/test_insert_null.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Insert nulls into fields of all types.
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_azure_dw.inc'); ?>
 --FILE--
 <?php
 
diff --git a/test/functional/sqlsrv/test_insert_nullStr.phpt b/test/functional/sqlsrv/test_insert_nullStr.phpt
index 826964bf..08e274c9 100644
Binary files a/test/functional/sqlsrv/test_insert_nullStr.phpt and b/test/functional/sqlsrv/test_insert_nullStr.phpt differ
diff --git a/test/functional/sqlsrv/test_largeData.phpt b/test/functional/sqlsrv/test_largeData.phpt
index e282df2a..4fa2d830 100644
--- a/test/functional/sqlsrv/test_largeData.phpt
+++ b/test/functional/sqlsrv/test_largeData.phpt
@@ -1,7 +1,7 @@
 --TEST--
 send a large amount (10MB) using encryption.
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_azure_dw.inc'); ?>
 --FILE--
 <?php
 class my_stream {
diff --git a/test/functional/sqlsrv/test_newError_msg.phpt b/test/functional/sqlsrv/test_newError_msg.phpt
index 46771605..14b5918c 100644
--- a/test/functional/sqlsrv/test_newError_msg.phpt
+++ b/test/functional/sqlsrv/test_newError_msg.phpt
@@ -4,7 +4,7 @@ test new error messages when sqlsrv_get_field is called
 new error messages when sqlsrv_get_field is called before sqlsrv_fetch or 
 if sqlsrv_get_field is called with out of order field indices.
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_azure_dw.inc'); ?>
 --FILE--
 <?php
 
diff --git a/test/functional/sqlsrv/test_sqlsrv_phptype_stream.phpt b/test/functional/sqlsrv/test_sqlsrv_phptype_stream.phpt
index 5a150420..cdf14535 100644
Binary files a/test/functional/sqlsrv/test_sqlsrv_phptype_stream.phpt and b/test/functional/sqlsrv/test_sqlsrv_phptype_stream.phpt differ
diff --git a/test/functional/sqlsrv/test_stream.phpt b/test/functional/sqlsrv/test_stream.phpt
index 3836341d..dee4e72e 100644
--- a/test/functional/sqlsrv/test_stream.phpt
+++ b/test/functional/sqlsrv/test_stream.phpt
@@ -14,7 +14,7 @@ Test for stream zombifying.
         fatalError("Failed to connect.");
     }
 
-    $stmt = sqlsrv_query($conn, "SELECT * FROM [test_streamable_types]");
+    $stmt = sqlsrv_query($conn, "SELECT * FROM sys.objects");
     $metadata = sqlsrv_field_metadata($stmt);
     $count = count($metadata);
     sqlsrv_fetch($stmt);
diff --git a/test/functional/sqlsrv/test_warning_errors2.phpt b/test/functional/sqlsrv/test_warning_errors2.phpt
index 4145565a..15353ac6 100644
--- a/test/functional/sqlsrv/test_warning_errors2.phpt
+++ b/test/functional/sqlsrv/test_warning_errors2.phpt
@@ -15,7 +15,7 @@ if( $conn === false ) {
     die( print_r( sqlsrv_errors(), true ));
 }
 
-$stmt = sqlsrv_prepare( $conn, "SELECT * FROM [cd_info]");
+$stmt = sqlsrv_prepare( $conn, "SELECT * FROM sys.objects");
 
 $result = sqlsrv_field_metadata( $stmt );
 if( $result === false ) {