diff --git a/buildscripts/buildtools.py b/buildscripts/buildtools.py
index 884ceb56..b0ed5462 100644
--- a/buildscripts/buildtools.py
+++ b/buildscripts/buildtools.py
@@ -101,15 +101,10 @@ class BuildUtil(object):
     def compiler_version(self, sdk_dir):
         """Return the appropriate compiler version based on PHP version."""
         if self.vc == '':
-            VC = 'vc14'
+            VC = 'vc15'
             version = self.version_label()
-            if version >= '72':     # Compiler version for PHP 7.2 or above
-                VC = 'vc15'
-                if version == '74':
-                    # Compiler version for PHP 7.4 or above
-                    # Can be compiled using VS 2017 or VS 2019
-                    print('Checking compiler versions...')
-                    VC = self.determine_compiler(sdk_dir, 15)
+            if version == '8':     # Compiler version for PHP 8.0 or above
+                VC = 'vs16'
             self.vc = VC
             print('Compiler: ' + self.vc)
         return self.vc
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_bindColumn.phpt b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_bindColumn.phpt
index 3904d76e..c0e1c86a 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_bindColumn.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_bindColumn.phpt
@@ -1,7 +1,7 @@
 --TEST--
 a variable bound to a column in a result set
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_bindParam.phpt b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_bindParam.phpt
index 11f22687..d51b8a73 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_bindParam.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_bindParam.phpt
@@ -1,7 +1,7 @@
 --TEST--
 after a variable is bound, changing the value changes the value passed in the query
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_bindParam_2.phpt b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_bindParam_2.phpt
index f514821e..889e2e24 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_bindParam_2.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_bindParam_2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 accesses an output parameter
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_bindParam_3.phpt b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_bindParam_3.phpt
index d211c29b..a409e645 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_bindParam_3.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_bindParam_3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 uses an input/output parameter
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
    require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_bindValue.phpt b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_bindValue.phpt
index 07e70b0e..b3c25f78 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_bindValue.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_bindValue.phpt
@@ -1,7 +1,7 @@
 --TEST--
 after a value $contact is bound, changing the value does not change the value passed in the query
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_closeCursor.phpt b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_closeCursor.phpt
index 5cd8cd82..2744b47d 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_closeCursor.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_closeCursor.phpt
@@ -1,7 +1,7 @@
 --TEST--
 closes the cursor
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_columnCount.phpt b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_columnCount.phpt
index ba3ca910..dd3aab95 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_columnCount.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_columnCount.phpt
@@ -1,7 +1,7 @@
 --TEST--
 returns the number of columns in a result set for 3 queries
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_debugDumpParams.phpt b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_debugDumpParams.phpt
index 55c0b8fa..b4b21562 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_debugDumpParams.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_debugDumpParams.phpt
@@ -1,7 +1,7 @@
 --TEST--
 displays a prepared statement
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_errorCode.phpt b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_errorCode.phpt
index 2a3e7501..e9fc6d70 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_errorCode.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_errorCode.phpt
@@ -1,11 +1,12 @@
 --TEST--
 shows the error code of a SQL query with a mispelled table
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
 $conn = new PDO( "sqlsrv:server=$server; Database = $databaseName", "$uid", "$pwd");
+$conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
 $stmt = $conn->prepare('SELECT * FROM Person.Addressx');
 
 $stmt->execute();
@@ -13,8 +14,8 @@ echo "Error Code: ";
 print $stmt->errorCode();
 
 // free the statement and connection 
-$stmt=null;
-$conn=null;
+unset($stmt);
+unset($conn);
 ?>
 --EXPECT--
 Error Code: 42S02
\ No newline at end of file
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_errorInfo.phpt b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_errorInfo.phpt
index 5c958b6e..b827ff1e 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_errorInfo.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_errorInfo.phpt
@@ -1,19 +1,20 @@
 --TEST--
 reports the error info of a SQL statement with a mispelled table name
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
 $conn = new PDO( "sqlsrv:server=$server ; Database = $databaseName", "$uid", "$pwd");
+$conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
 $stmt = $conn->prepare('SELECT * FROM Person.Addressx');
 
 $stmt->execute();
 print_r ($stmt->errorInfo());
 
 // free the statement and connection 
-$stmt=null;
-$conn=null;
+unset($stmt);
+unset($conn);
 ?>
 --EXPECTREGEX--
 Array
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_execute.phpt b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_execute.phpt
index b43bd1c7..12169d89 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_execute.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_execute.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Executes a statement
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_fetch.phpt b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_fetch.phpt
index f8cc9190..e65eb156 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_fetch.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_fetch.phpt
@@ -1,7 +1,7 @@
 --TEST--
 fetch with all fetch styles
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
    require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_fetchAll.phpt b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_fetchAll.phpt
index 1611942c..1d85aef6 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_fetchAll.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_fetchAll.phpt
@@ -1,7 +1,7 @@
 --TEST--
 fetches the rows in a result set in an array
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
    require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_fetchColumn.phpt b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_fetchColumn.phpt
index f2137200..dc6b3c3c 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_fetchColumn.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_fetchColumn.phpt
@@ -1,7 +1,7 @@
 --TEST--
 fetches a column in a row
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
    require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_fetchObject.phpt b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_fetchObject.phpt
index 93158bb4..863a1330 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_fetchObject.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_fetchObject.phpt
@@ -1,7 +1,7 @@
 --TEST--
 fetches the next row as an object
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 	require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_fetchObject_class_name.phpt b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_fetchObject_class_name.phpt
index a1cd3820..da72e60b 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_fetchObject_class_name.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_fetchObject_class_name.phpt
@@ -1,7 +1,7 @@
 --TEST--
 fetches the next row as an object of a user defined class
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 	//create class of contactType
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_getColumnMeta.phpt b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_getColumnMeta.phpt
index 80ad5cdd..e907a6da 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_getColumnMeta.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_getColumnMeta.phpt
@@ -1,7 +1,7 @@
 --TEST--
 retrieves metadata for a column
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_nextRowset.phpt b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_nextRowset.phpt
index 475083c7..abbbe939 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_nextRowset.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_nextRowset.phpt
@@ -1,7 +1,7 @@
 --TEST--
 moves the cursor to the next result set and fetches results
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_rowCount.phpt b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_rowCount.phpt
index 58c7d563..975a6264 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_rowCount.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_rowCount.phpt
@@ -1,7 +1,7 @@
 --TEST--
 returns the number of rows added to a table; returns the number of rows in a result set when you specify a scrollable cursor
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_setAttribute.phpt b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_setAttribute.phpt
index e579d851..ea94b509 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_setAttribute.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_setAttribute.phpt
@@ -1,7 +1,7 @@
 --TEST--
 sets the query timeout attribute
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_setFetchMode.phpt b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_setFetchMode.phpt
index 85419b5d..b0f3a00f 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdoStatement_setFetchMode.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdoStatement_setFetchMode.phpt
@@ -1,7 +1,7 @@
 --TEST--
 specifies the fetch mode before fetching
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
    require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdo_beginTransaction.phpt b/test/bvt/pdo_sqlsrv/msdn_pdo_beginTransaction.phpt
index b28b09ce..edc0632f 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdo_beginTransaction.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdo_beginTransaction.phpt
@@ -1,7 +1,7 @@
 --TEST--
 starts a transaction, insert 2 rows and commit the transaction
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 	require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdo_construct.phpt b/test/bvt/pdo_sqlsrv/msdn_pdo_construct.phpt
index ea1875ed..0a1de02a 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdo_construct.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdo_construct.phpt
@@ -1,7 +1,7 @@
 --TEST--
 connect to a server and specify a database
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
    require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdo_construct_2.phpt b/test/bvt/pdo_sqlsrv/msdn_pdo_construct_2.phpt
index c2032000..5f937210 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdo_construct_2.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdo_construct_2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 connect to a server, specifying the database later
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
    require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdo_construct_MARS.phpt b/test/bvt/pdo_sqlsrv/msdn_pdo_construct_MARS.phpt
index 8dfd6762..a92e6848 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdo_construct_MARS.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdo_construct_MARS.phpt
@@ -1,7 +1,7 @@
 --TEST--
 connect to a server, setting MARS to false
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdo_errorCode.phpt b/test/bvt/pdo_sqlsrv/msdn_pdo_errorCode.phpt
index 59cfc751..d5cf9976 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdo_errorCode.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdo_errorCode.phpt
@@ -1,18 +1,19 @@
 --TEST--
 reports the error code of querying a misspelled column
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
 $conn = new PDO( "sqlsrv:Server=$server ; Database = $databaseName ", "$uid", "$pwd");
+$conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
 $query = "SELECT * FROM Person.Address where Cityx = 'Essen'";
 
 $conn->query($query);
 print $conn->errorCode();
 
 //free the connection
-$conn=null;
+unset($conn);
 ?>
 --EXPECT--
 42S22
\ No newline at end of file
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdo_errorInfo.phpt b/test/bvt/pdo_sqlsrv/msdn_pdo_errorInfo.phpt
index 62c112f9..3b787887 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdo_errorInfo.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdo_errorInfo.phpt
@@ -1,11 +1,12 @@
 --TEST--
 reports the error info of querying a misspelled column
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
 $conn = new PDO( "sqlsrv:Server=$server ; Database = $databaseName ", "$uid", "$pwd");
+$conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
 $query = "SELECT * FROM Person.Address where Cityx = 'Essen'";
 
 $conn->query($query);
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdo_exec.phpt b/test/bvt/pdo_sqlsrv/msdn_pdo_exec.phpt
index 76ede8e8..2f0f9b12 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdo_exec.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdo_exec.phpt
@@ -1,7 +1,7 @@
 --TEST--
 execute a delete and reports how many rows were deleted
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
    require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdo_getAttribute.phpt b/test/bvt/pdo_sqlsrv/msdn_pdo_getAttribute.phpt
index eb9a44c1..50da236b 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdo_getAttribute.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdo_getAttribute.phpt
@@ -1,11 +1,12 @@
 --TEST--
 shows the PDO::ATR_ERRMODE attribute, before and after changing its value
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
 $conn = new PDO( "sqlsrv:Server=$server ; Database = $databaseName", "$uid", "$pwd");
+$conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
 
 $attributes1 = array( "ERRMODE" );
 foreach ( $attributes1 as $val ) {
@@ -13,7 +14,7 @@ foreach ( $attributes1 as $val ) {
      var_dump ($conn->getAttribute( constant( "PDO::ATTR_$val" ) ));
 }
 
-$conn->setAttribute( PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION );
+$conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
 $attributes1 = array( "ERRMODE" );
 foreach ( $attributes1 as $val ) {
@@ -25,7 +26,7 @@ foreach ( $attributes1 as $val ) {
 print_r($conn->getAttribute( PDO::ATTR_CLIENT_VERSION ));
 
 //free the connection
-$conn=null;
+unset($conn);
 ?>
 --EXPECTREGEX--
 PDO::ATTR_ERRMODE: int\(0\)
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdo_getAvailableDrivers.phpt b/test/bvt/pdo_sqlsrv/msdn_pdo_getAvailableDrivers.phpt
index 7db00eea..672625b3 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdo_getAvailableDrivers.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdo_getAvailableDrivers.phpt
@@ -1,7 +1,7 @@
 --TEST--
 check if sqlsrv is in the array of available PDO drivers
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 $drivers = PDO::getAvailableDrivers();
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdo_prepare.phpt b/test/bvt/pdo_sqlsrv/msdn_pdo_prepare.phpt
index 486ef016..6b192631 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdo_prepare.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdo_prepare.phpt
@@ -1,7 +1,7 @@
 --TEST--
 prepares a statement with parameter markers and forward-only (server-side) cursor
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdo_prepare_2.phpt b/test/bvt/pdo_sqlsrv/msdn_pdo_prepare_2.phpt
index 639b5b7c..0cf9f468 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdo_prepare_2.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdo_prepare_2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 prepares a statement with a client-side cursor
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdo_prepare_cursor.phpt b/test/bvt/pdo_sqlsrv/msdn_pdo_prepare_cursor.phpt
index 2bb2d4eb..830ce2bd 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdo_prepare_cursor.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdo_prepare_cursor.phpt
@@ -1,7 +1,7 @@
 --TEST--
 prepares a statement with a client-side cursor and specifies scroll type to buffered
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdo_query.phpt b/test/bvt/pdo_sqlsrv/msdn_pdo_query.phpt
index 77029053..15a85b18 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdo_query.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdo_query.phpt
@@ -1,7 +1,7 @@
 --TEST--
 default query; query for a column; query with a new class; query into an existing class
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdo_quote.phpt b/test/bvt/pdo_sqlsrv/msdn_pdo_quote.phpt
index 73ffc429..6bd10956 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdo_quote.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdo_quote.phpt
@@ -1,7 +1,7 @@
 --TEST--
 insert with quoted parameters
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdo_setAttribute.phpt b/test/bvt/pdo_sqlsrv/msdn_pdo_setAttribute.phpt
index 8991ffa9..28e713a6 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdo_setAttribute.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdo_setAttribute.phpt
@@ -1,11 +1,12 @@
 --TEST--
 sets to PDO::ATTR_ERRMODE
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
    require('connect.inc');	
    $conn = new PDO( "sqlsrv:server=$server ; Database = $databaseName", "$uid", "$pwd");
+   $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
 
    $attributes1 = array( "ERRMODE" );
    foreach ( $attributes1 as $val ) {
@@ -22,7 +23,7 @@ sets to PDO::ATTR_ERRMODE
    }
    
    //free the connection
-   $conn=null;
+   unset($conn);
 ?>
 --EXPECT--
 PDO::ATTR_ERRMODE: int(0)
diff --git a/test/bvt/pdo_sqlsrv/msdn_pdo_setAttribute_direct_query.phpt b/test/bvt/pdo_sqlsrv/msdn_pdo_setAttribute_direct_query.phpt
index ae2ca1b1..f78c59ba 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdo_setAttribute_direct_query.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdo_setAttribute_direct_query.phpt
@@ -1,42 +1,45 @@
 --TEST--
 sets to PDO::SQLSRV_ATTR_DIRECT_QUERY
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
-   require('connect.inc');	
-   $conn = new PDO("sqlsrv:Server=$server", "$uid", "$pwd");
-   $conn->setAttribute(constant('PDO::SQLSRV_ATTR_DIRECT_QUERY'), true);
+    require('connect.inc');	
+    $conn = new PDO("sqlsrv:Server=$server", "$uid", "$pwd");
+    $conn->setAttribute(constant('PDO::SQLSRV_ATTR_DIRECT_QUERY'), true);
 
-   $stmt1 = $conn->query("DROP TABLE #php_test_table");
+    $tableName = 'pdo_direct_query';
+    $tsql = "IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'" . $tableName . "') AND type in (N'U')) DROP TABLE $tableName";
 
-   $stmt2 = $conn->query("CREATE TABLE #php_test_table ([c1_int] int, [c2_int] int)");
+    $stmt1 = $conn->query($tsql);
+    $stmt2 = $conn->query("CREATE TABLE $tableName ([c1_int] int, [c2_int] int)");
 
-   $v1 = 1;
-   $v2 = 2;
+    $v1 = 1;
+    $v2 = 2;
 
-   $stmt3 = $conn->prepare("INSERT INTO #php_test_table (c1_int, c2_int) VALUES (:var1, :var2)");
+    $stmt3 = $conn->prepare("INSERT INTO $tableName (c1_int, c2_int) VALUES (:var1, :var2)");
 
-   if ($stmt3) {
+    if ($stmt3) {
       $stmt3->bindValue(1, $v1);
       $stmt3->bindValue(2, $v2);
 
-      if ($stmt3->execute())
+      if ($stmt3->execute()) {
          echo "Execution succeeded\n";     
-      else
+      } else {
          echo "Execution failed\n";
-   }
-   else
+      }
+    } else {
       var_dump($conn->errorInfo());
+    }
 
-   $stmt4 = $conn->query("DROP TABLE #php_test_table");
+    $stmt4 = $conn->query("DROP TABLE $tableName");
 
-   // free the statements and connection
-   $stmt1=null;
-   $stmt2=null;
-   $stmt3=null;
-   $stmt4=null;
-   $conn=null;
-   ?>
+    // free the statements and connection
+    unset($stmt1);
+    unset($stmt2);
+    unset($stmt3);
+    unset($stmt4);
+    unset($conn);
+?>
 --EXPECT--
 Execution succeeded
\ No newline at end of file
diff --git a/test/bvt/pdo_sqlsrv/pdo_bindParam_inout_double.phpt b/test/bvt/pdo_sqlsrv/pdo_bindParam_inout_double.phpt
index abcbdac2..f82871f3 100644
--- a/test/bvt/pdo_sqlsrv/pdo_bindParam_inout_double.phpt
+++ b/test/bvt/pdo_sqlsrv/pdo_bindParam_inout_double.phpt
@@ -1,7 +1,7 @@
 --TEST--
 call a stored procedure and retrieve the errorNumber that is returned
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 	require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/pdo_bindParam_inout_integer.phpt b/test/bvt/pdo_sqlsrv/pdo_bindParam_inout_integer.phpt
index d1e6839c..57135fe9 100644
--- a/test/bvt/pdo_sqlsrv/pdo_bindParam_inout_integer.phpt
+++ b/test/bvt/pdo_sqlsrv/pdo_bindParam_inout_integer.phpt
@@ -1,7 +1,7 @@
 --TEST--
 call a stored procedure and retrieve the errorNumber that is returned
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 	require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/pdo_bindParam_inout_string.phpt b/test/bvt/pdo_sqlsrv/pdo_bindParam_inout_string.phpt
index b8d60af2..f2743392 100644
--- a/test/bvt/pdo_sqlsrv/pdo_bindParam_inout_string.phpt
+++ b/test/bvt/pdo_sqlsrv/pdo_bindParam_inout_string.phpt
@@ -1,7 +1,7 @@
 --TEST--
 call a stored procedure and retrieve the errorString that is returned
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 	require('connect.inc');
diff --git a/test/bvt/pdo_sqlsrv/skipif.inc b/test/bvt/pdo_sqlsrv/skipif.inc
new file mode 100644
index 00000000..ab29e6c5
--- /dev/null
+++ b/test/bvt/pdo_sqlsrv/skipif.inc
@@ -0,0 +1,4 @@
+<?php
+if (!extension_loaded("pdo_sqlsrv")) {
+    die("skip Extension not loaded");
+}
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_begin_transaction.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_begin_transaction.phpt
index c4b5c9b9..399f7a73 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_begin_transaction.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_begin_transaction.phpt
@@ -1,7 +1,7 @@
 --TEST--
 executes two queries as part of a transaction
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_begin_transaction_2.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_begin_transaction_2.phpt
index e7b4abcf..55f2398a 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_begin_transaction_2.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_begin_transaction_2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 delete in a transaction
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 /* Connect to the local server using Windows Authentication and
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_cancel.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_cancel.phpt
index 9e60a486..a2485caf 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_cancel.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_cancel.phpt
@@ -1,7 +1,7 @@
 --TEST--
 executes a query, then comsumes and counts results until reaches a specified amount. The remaining query results are then discarded.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_cancel_1.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_cancel_1.phpt
index 6bf0bcc4..064c1f69 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_cancel_1.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_cancel_1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 cancels a statement then reuse.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_client_info.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_client_info.phpt
index e979b422..290bab88 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_client_info.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_client_info.phpt
@@ -1,7 +1,7 @@
 --TEST--
 client information.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_close.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_close.phpt
index 0b95facc..245d61af 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_close.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_close.phpt
@@ -1,7 +1,7 @@
 --TEST--
 closes a connection.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_commit.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_commit.phpt
index ddcff9fc..7b2e2ae5 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_commit.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_commit.phpt
@@ -1,8 +1,7 @@
 --TEST--
 executes two queries as part of a transaction. If both queries are successful, the transaction is committed.
 --SKIPIF--
-
-?>
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_configure.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_configure.phpt
index 3e7aa37f..44909b0c 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_configure.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_configure.phpt
@@ -1,8 +1,7 @@
 --TEST--
 disables the default error-handling behaviour using configure
 --SKIPIF--
-
-?>
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 /* Connect to the local server using Windows Authentication. */
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_configure_2.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_configure_2.phpt
index 8e8ff1be..86cbd3b4 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_configure_2.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_configure_2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 disables the default error-handling behaviour using configure and returns warnings
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 /* Turn off the default behavior of treating errors as warnings.
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_connect.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_connect.phpt
index 6e8baef5..7d6c6f48 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_connect.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_connect.phpt
@@ -1,7 +1,7 @@
 --TEST--
 creates and opens a connection using Windows Authentication.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_connect_MARS.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_connect_MARS.phpt
index 6e6adfb2..55d40f4f 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_connect_MARS.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_connect_MARS.phpt
@@ -1,7 +1,7 @@
 --TEST--
 disables MARS support.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_connect_returnDateAsStrings.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_connect_returnDateAsStrings.phpt
index 8d7900de..99441834 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_connect_returnDateAsStrings.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_connect_returnDateAsStrings.phpt
@@ -1,7 +1,7 @@
 --TEST--
 specifies to retrieve date and time types as string when connecting.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_connect_returnDatesAsStrings_utf8.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_connect_returnDatesAsStrings_utf8.phpt
index a6de7683..1265a82f 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_connect_returnDatesAsStrings_utf8.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_connect_returnDatesAsStrings_utf8.phpt
@@ -1,7 +1,7 @@
 --TEST--
 retrieves dates as string by specifying UTF-8 and ReturnDatesAsStrings when connecting.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_connect_utf8.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_connect_utf8.phpt
index d6adce7c..b6b35d2a 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_connect_utf8.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_connect_utf8.phpt
@@ -1,7 +1,7 @@
 --TEST--
 retrieves UTF-8 encoded data by specifying the UTF-8 character set when making the connection
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_date_format.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_date_format.phpt
index 0e5f6c0b..cabeeb94 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_date_format.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_date_format.phpt
@@ -1,7 +1,7 @@
 --TEST--
 retrieve date as PHP type with ReturnDatesAsStrings off by default.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_errors.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_errors.phpt
index 4c296046..e49bd8be 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_errors.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_errors.phpt
@@ -1,7 +1,7 @@
 --TEST--
 displays errors that occur during a failed statement execution
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_execute.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_execute.phpt
index a44cd93a..a7f0ed39 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_execute.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_execute.phpt
@@ -1,7 +1,7 @@
 --TEST--
 executes a statement that updates a field.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_execute_datetime.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_execute_datetime.phpt
index caac6ede..b1a9b560 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_execute_datetime.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_execute_datetime.phpt
@@ -1,8 +1,7 @@
 --TEST--
 execute with datetime type in bind parameters.
 --SKIPIF--
-
-?>
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_execute_string.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_execute_string.phpt
index c9effa18..ce173e3e 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_execute_string.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_execute_string.phpt
@@ -1,8 +1,7 @@
 --TEST--
 execute with string type in bind parameters.
 --SKIPIF--
-
-?>
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_fetch.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_fetch.phpt
index a5162be1..59232238 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_fetch.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_fetch.phpt
@@ -1,7 +1,7 @@
 --TEST--
 retrieve a row of data.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_fetch_array.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_fetch_array.phpt
index b355f74a..a2424199 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_fetch_array.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_fetch_array.phpt
@@ -1,7 +1,7 @@
 --TEST--
 retrieves each row of a result set as an associative array.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_fetch_array_2.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_fetch_array_2.phpt
index 4d803987..7ab64b5d 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_fetch_array_2.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_fetch_array_2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 retrieves each row of a result set as a numerically indexed array.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 /* Connect to the local server using Windows Authentication and
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_fetch_object.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_fetch_object.phpt
index 77cc759e..d0832f1d 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_fetch_object.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_fetch_object.phpt
@@ -1,8 +1,7 @@
 --TEST--
 retrieves each row of a result set as a PHP object
 --SKIPIF--
-
-?>
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_fetch_object_2.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_fetch_object_2.phpt
index 54177f37..73f2ea13 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_fetch_object_2.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_fetch_object_2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 retrieves each row of a result set as an instance of the Product class defined in the script.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 /* Define the Product class. */
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_field_metadata.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_field_metadata.phpt
index 5e596774..faa84225 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_field_metadata.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_field_metadata.phpt
@@ -1,7 +1,7 @@
 --TEST--
 creates a statement resource then retrieves and displays the field metadata
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_free_stmt.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_free_stmt.phpt
index db66ad54..29051e20 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_free_stmt.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_free_stmt.phpt
@@ -1,7 +1,7 @@
 --TEST--
 creates a statement resource, executes a simple query, and free all resources associated with the statement
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_get_field.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_get_field.phpt
index c663a2c1..c53b49e9 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_get_field.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_get_field.phpt
@@ -1,7 +1,7 @@
 --TEST--
 retrieves a row of data
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_get_field_stream.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_get_field_stream.phpt
index a2e1b5a9..437a1e94 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_get_field_stream.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_get_field_stream.phpt
@@ -1,7 +1,7 @@
 --TEST--
 retrieves datatime as string and nvarchar as stream.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 /* Connect to the local server using Windows Authentication and 
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_get_field_stream_char.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_get_field_stream_char.phpt
index 257fa109..5dfdbef7 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_get_field_stream_char.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_get_field_stream_char.phpt
@@ -1,7 +1,7 @@
 --TEST--
 retrieves row as a stream specified as a character stream.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 /*Connect to the local server using Windows Authentication and
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_get_field_string_utf8.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_get_field_string_utf8.phpt
index e28258d1..6a475aca 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_get_field_string_utf8.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_get_field_string_utf8.phpt
@@ -1,7 +1,7 @@
 --TEST--
 retrieves dates as strings by specifying UTF-8 when fetching the string.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_has_rows.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_has_rows.phpt
index 7b514105..69458364 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_has_rows.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_has_rows.phpt
@@ -1,7 +1,7 @@
 --TEST--
 indicate if the result set has one or more rows.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_next_result.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_next_result.phpt
index 039bbadd..92250def 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_next_result.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_next_result.phpt
@@ -1,7 +1,7 @@
 --TEST--
 first result is consumed without calling next_result, the next result is made available by calling next_result
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 /* Connect to the local server using Windows Authentication and 
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_next_result_2.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_next_result_2.phpt
index 0a191780..477803d5 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_next_result_2.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_next_result_2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 executes a batch query that retrieves information, insert an entry, then again retrieves information
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 /* Connect to the local server using Windows Authentication and
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_num_fields.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_num_fields.phpt
index 6f5ef96b..cc5645eb 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_num_fields.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_num_fields.phpt
@@ -1,7 +1,7 @@
 --TEST--
 retrieve all fields
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_num_rows.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_num_rows.phpt
index e37ee376..170a2d8b 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_num_rows.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_num_rows.phpt
@@ -1,7 +1,7 @@
 --TEST--
 num_rows with a ekyset cursor should work.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_num_rows_2.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_num_rows_2.phpt
index 76d7afda..a42dfff5 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_num_rows_2.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_num_rows_2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 when there is a batch query, the number of rows is only available when use a client-side cursor.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_prepare.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_prepare.phpt
index 54a1535d..5a030580 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_prepare.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_prepare.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Prepares and executes a statement.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 /* Connect to the local server using Windows Authentication and
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_prepare_2.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_prepare_2.phpt
index b22724eb..9cbc8824 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_prepare_2.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_prepare_2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Prepares a statement and then re-execute it with different parameter values.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_prepare_bind_param.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_prepare_bind_param.phpt
index 56b2bf00..e4a91a76 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_prepare_bind_param.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_prepare_bind_param.phpt
@@ -1,7 +1,7 @@
 --TEST--
 binding of variables using prepare function
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 /* Connect to the local server using Windows Authentication and
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_prepare_scrollable_buffered.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_prepare_scrollable_buffered.phpt
index 50d071e9..2113c6df 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_prepare_scrollable_buffered.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_prepare_scrollable_buffered.phpt
@@ -1,7 +1,7 @@
 --TEST--
 server side cursor specified when preparing
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_query.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_query.phpt
index cd5a19c4..f3f45f59 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_query.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_query.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Query insert into a table
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 /* Connect to the local server using Windows Authentication and
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_query_2.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_query_2.phpt
index 8b95c87d..84f88e22 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_query_2.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_query_2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Query update a field in a table
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_query_bind_param.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_query_bind_param.phpt
index ee43e3e3..7392ed7a 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_query_bind_param.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_query_bind_param.phpt
@@ -1,7 +1,7 @@
 --TEST--
 updates the quantity in a table, the quantity and product ID are parameters in the UPDATE query.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 /* Connect to the local server using Windows Authentication and
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_query_param_inout.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_query_param_inout.phpt
index 693b2739..227780d0 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_query_param_inout.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_query_param_inout.phpt
@@ -1,7 +1,7 @@
 --TEST--
 queries a call procedure with an in-out parameter.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_query_param_out.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_query_param_out.phpt
index 62662dda..3c8696b8 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_query_param_out.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_query_param_out.phpt
@@ -1,7 +1,7 @@
 --TEST--
 queries a call to procedure with input and output parameters.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 /* Connect to a server using Windows Authentication and 
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_query_scrollable.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_query_scrollable.phpt
index a42c9d2f..f4649d3f 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_query_scrollable.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_query_scrollable.phpt
@@ -1,7 +1,7 @@
 --TEST--
 server side cursor specified when querying
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_query_scrollable_buffered.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_query_scrollable_buffered.phpt
index a0789ea4..f8731b29 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_query_scrollable_buffered.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_query_scrollable_buffered.phpt
@@ -1,7 +1,7 @@
 --TEST--
 client side buffered cursor
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_query_sqltype.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_query_sqltype.phpt
index 0ecd18e6..7ea8f3f1 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_query_sqltype.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_query_sqltype.phpt
@@ -1,7 +1,7 @@
 --TEST--
 sqlsrv types are specified for the parameters in query.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 /* Connect to the local server using Windows Authentication and 
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_query_stream.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_query_stream.phpt
index 9a7a14fe..7a5d1a40 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_query_stream.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_query_stream.phpt
@@ -1,6 +1,7 @@
 --TEST--
 insert stream.
 --SKIPIF--
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 /* Connect to the local server using Windows Authentication and
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_query_utf8.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_query_utf8.phpt
index 100d1ce4..b0779295 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_query_utf8.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_query_utf8.phpt
@@ -1,7 +1,7 @@
 --TEST--
 specify the UTF-8 character set when querying
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_rollback.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_rollback.phpt
index d96c8373..329dd07c 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_rollback.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_rollback.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Rolls back the current transaction on the specified connection and returns the connection to the auto-commit mode.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_rows_affected.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_rows_affected.phpt
index 983812ab..8fcd928d 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_rows_affected.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_rows_affected.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Returns the number of rows modified by the last statement executed.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_send_stream_data.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_send_stream_data.phpt
index d4a7ea23..9f321b35 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_send_stream_data.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_send_stream_data.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Sends data from parameter streams to the server
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 require('connect.inc');
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_send_stream_data_no_sendStreamParamsAtExec.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_send_stream_data_no_sendStreamParamsAtExec.phpt
index 0696e50f..d622024d 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_send_stream_data_no_sendStreamParamsAtExec.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_send_stream_data_no_sendStreamParamsAtExec.phpt
@@ -1,6 +1,7 @@
 --TEST--
 Send stream data with SendStreamParamsAtExec turned off.
 --SKIPIF--
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 /* Connect to the local server using Windows Authentication and
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_server_info.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_server_info.phpt
index c15096b5..b941d1e3 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_server_info.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_server_info.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Returns information about the server.
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 /* Connect to the local server using Windows Authentication. */
diff --git a/test/bvt/sqlsrv/skipif.inc b/test/bvt/sqlsrv/skipif.inc
new file mode 100644
index 00000000..47bb9293
--- /dev/null
+++ b/test/bvt/sqlsrv/skipif.inc
@@ -0,0 +1,7 @@
+<?php
+
+if (!extension_loaded("sqlsrv")) {
+    die("skip extension not loaded");
+}
+
+?>
\ No newline at end of file
diff --git a/test/bvt/sqlsrv/sqlsrv_param_inout.phpt b/test/bvt/sqlsrv/sqlsrv_param_inout.phpt
index 603f0ab5..5bc3e2a5 100644
--- a/test/bvt/sqlsrv/sqlsrv_param_inout.phpt
+++ b/test/bvt/sqlsrv/sqlsrv_param_inout.phpt
@@ -1,7 +1,7 @@
 --TEST--
 call a stored procedure (SQLSRV Driver) and retrieve the errorNumber that is returned
 --SKIPIF--
-
+<?php require('skipif.inc'); ?>
 --FILE--
 <?php
 	// Connect to the database