diff --git a/test/functional/sqlsrv/TC36_Close.phpt b/test/functional/sqlsrv/TC36_Close.phpt
index 901f032a..7df34c79 100644
--- a/test/functional/sqlsrv/TC36_Close.phpt
+++ b/test/functional/sqlsrv/TC36_Close.phpt
@@ -7,7 +7,7 @@ Validates that a closed statement cannot be reused.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC37_QueryTimeout.phpt b/test/functional/sqlsrv/TC37_QueryTimeout.phpt
index 65b81d3d..a8084821 100644
--- a/test/functional/sqlsrv/TC37_QueryTimeout.phpt
+++ b/test/functional/sqlsrv/TC37_QueryTimeout.phpt
@@ -9,7 +9,7 @@ longer than the query timeout.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC38_InvalidQuery.phpt b/test/functional/sqlsrv/TC38_InvalidQuery.phpt
index b522bb6c..be87f43a 100644
--- a/test/functional/sqlsrv/TC38_InvalidQuery.phpt
+++ b/test/functional/sqlsrv/TC38_InvalidQuery.phpt
@@ -5,7 +5,7 @@ Verifies of "sqlsrv_query" response to invalid query attempts
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC39_Cursors.phpt b/test/functional/sqlsrv/TC39_Cursors.phpt
index 904e3cfd..ecbeb2d0 100644
--- a/test/functional/sqlsrv/TC39_Cursors.phpt
+++ b/test/functional/sqlsrv/TC39_Cursors.phpt
@@ -5,7 +5,7 @@ Verifies the functionality associated with scrollable resultsets.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC41_FetchMetadata.phpt b/test/functional/sqlsrv/TC41_FetchMetadata.phpt
index 68bad210..e99845ca 100644
--- a/test/functional/sqlsrv/TC41_FetchMetadata.phpt
+++ b/test/functional/sqlsrv/TC41_FetchMetadata.phpt
@@ -9,7 +9,7 @@ Validates functionality with statement in both prepared and executed state.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC42_FetchField.phpt b/test/functional/sqlsrv/TC42_FetchField.phpt
index 32215332..462f95f6 100644
--- a/test/functional/sqlsrv/TC42_FetchField.phpt
+++ b/test/functional/sqlsrv/TC42_FetchField.phpt
@@ -6,7 +6,7 @@ retrieving fields from a table including rows with all supported SQL types (28 t
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC43_FetchData.phpt b/test/functional/sqlsrv/TC43_FetchData.phpt
index 44765f42..f520672c 100644
--- a/test/functional/sqlsrv/TC43_FetchData.phpt
+++ b/test/functional/sqlsrv/TC43_FetchData.phpt
@@ -3,7 +3,7 @@ Fetch Field Data Test verifies the data retrieved via "sqlsrv_get_field"
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 
diff --git a/test/functional/sqlsrv/TC44_FetchArray.phpt b/test/functional/sqlsrv/TC44_FetchArray.phpt
index ad3e1089..866e4cd6 100644
--- a/test/functional/sqlsrv/TC44_FetchArray.phpt
+++ b/test/functional/sqlsrv/TC44_FetchArray.phpt
@@ -6,7 +6,7 @@ by checking all fetch type modes.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC45_FetchObject.phpt b/test/functional/sqlsrv/TC45_FetchObject.phpt
index 91685558..ec20c417 100644
--- a/test/functional/sqlsrv/TC45_FetchObject.phpt
+++ b/test/functional/sqlsrv/TC45_FetchObject.phpt
@@ -5,7 +5,7 @@ Verifies data retrieval via "sqlsrv_fetch_object".
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC46_FetchNextResult.phpt b/test/functional/sqlsrv/TC46_FetchNextResult.phpt
index f6d27b86..f12a0c3f 100644
--- a/test/functional/sqlsrv/TC46_FetchNextResult.phpt
+++ b/test/functional/sqlsrv/TC46_FetchNextResult.phpt
@@ -5,7 +5,7 @@ Verifies the functionality of "sqlsrv_next_result"
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC47_ParamQuery.phpt b/test/functional/sqlsrv/TC47_ParamQuery.phpt
index af2342f2..ea85dd21 100644
--- a/test/functional/sqlsrv/TC47_ParamQuery.phpt
+++ b/test/functional/sqlsrv/TC47_ParamQuery.phpt
@@ -6,7 +6,7 @@ The query behavior is checked for all updateable data types.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC48_FetchScrollable.phpt b/test/functional/sqlsrv/TC48_FetchScrollable.phpt
index d801aa8d..44090245 100644
--- a/test/functional/sqlsrv/TC48_FetchScrollable.phpt
+++ b/test/functional/sqlsrv/TC48_FetchScrollable.phpt
@@ -5,7 +5,7 @@ Verifies data retrieval with scrollable result sets.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC51_StreamRead.phpt b/test/functional/sqlsrv/TC51_StreamRead.phpt
index 3bc9a09f..cc1b39e6 100644
--- a/test/functional/sqlsrv/TC51_StreamRead.phpt
+++ b/test/functional/sqlsrv/TC51_StreamRead.phpt
@@ -6,7 +6,7 @@ can be successfully retrieved as streams.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC52_StreamSend.phpt b/test/functional/sqlsrv/TC52_StreamSend.phpt
index d26382ed..648c23fd 100644
--- a/test/functional/sqlsrv/TC52_StreamSend.phpt
+++ b/test/functional/sqlsrv/TC52_StreamSend.phpt
@@ -8,7 +8,7 @@ via sqlsrv_send_stream_data (i.e. after execution).
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC53_StreamCancel.phpt b/test/functional/sqlsrv/TC53_StreamCancel.phpt
index 023da3d2..e1dcd1de 100644
--- a/test/functional/sqlsrv/TC53_StreamCancel.phpt
+++ b/test/functional/sqlsrv/TC53_StreamCancel.phpt
@@ -7,7 +7,7 @@ Verifies that a stream is invalidated by:
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC54_StreamPrepared.phpt b/test/functional/sqlsrv/TC54_StreamPrepared.phpt
index 6be810dc..94a6bbe8 100644
--- a/test/functional/sqlsrv/TC54_StreamPrepared.phpt
+++ b/test/functional/sqlsrv/TC54_StreamPrepared.phpt
@@ -7,7 +7,7 @@ Validates that a warning message is issued when parameters are not passed by ref
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC55_StreamScrollable.phpt b/test/functional/sqlsrv/TC55_StreamScrollable.phpt
index 736b1d09..f2fe5407 100644
--- a/test/functional/sqlsrv/TC55_StreamScrollable.phpt
+++ b/test/functional/sqlsrv/TC55_StreamScrollable.phpt
@@ -5,7 +5,7 @@ Verifies the streaming behavior with scrollable resultsets.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC61_TransactionExecution.phpt b/test/functional/sqlsrv/TC61_TransactionExecution.phpt
index 1329a6cf..5c0f4d4a 100644
--- a/test/functional/sqlsrv/TC61_TransactionExecution.phpt
+++ b/test/functional/sqlsrv/TC61_TransactionExecution.phpt
@@ -8,7 +8,7 @@ Two types of sequences are explored:
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC62_TransactionDisconnect.phpt b/test/functional/sqlsrv/TC62_TransactionDisconnect.phpt
index e8836001..82b7d31f 100644
--- a/test/functional/sqlsrv/TC62_TransactionDisconnect.phpt
+++ b/test/functional/sqlsrv/TC62_TransactionDisconnect.phpt
@@ -6,7 +6,7 @@ implicitly rollback the database changes attempted by the transaction.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC63_TransactionBounds.phpt b/test/functional/sqlsrv/TC63_TransactionBounds.phpt
index f967ea3f..b2c7070d 100644
--- a/test/functional/sqlsrv/TC63_TransactionBounds.phpt
+++ b/test/functional/sqlsrv/TC63_TransactionBounds.phpt
@@ -10,7 +10,7 @@ are inserted into the same table.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC64_TransactionProc.phpt b/test/functional/sqlsrv/TC64_TransactionProc.phpt
index ffa5cf85..de3071df 100644
--- a/test/functional/sqlsrv/TC64_TransactionProc.phpt
+++ b/test/functional/sqlsrv/TC64_TransactionProc.phpt
@@ -7,7 +7,7 @@ Two types of sequences are explored.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC71_StoredProc.phpt b/test/functional/sqlsrv/TC71_StoredProc.phpt
index 7b2a98ce..1a11389e 100644
--- a/test/functional/sqlsrv/TC71_StoredProc.phpt
+++ b/test/functional/sqlsrv/TC71_StoredProc.phpt
@@ -5,7 +5,7 @@ Verifies the ability to create and subsequently call a stored procedure.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC72_StoredFunc.phpt b/test/functional/sqlsrv/TC72_StoredFunc.phpt
index a9a63661..ab9393ec 100644
--- a/test/functional/sqlsrv/TC72_StoredFunc.phpt
+++ b/test/functional/sqlsrv/TC72_StoredFunc.phpt
@@ -5,7 +5,7 @@ Verifies the ability to create and subsequently call a stored procedure.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC73_ProcCall.phpt b/test/functional/sqlsrv/TC73_ProcCall.phpt
index d2970f11..c1afebe9 100644
--- a/test/functional/sqlsrv/TC73_ProcCall.phpt
+++ b/test/functional/sqlsrv/TC73_ProcCall.phpt
@@ -5,7 +5,7 @@ Verifies the ability to create and subsequently call a stored procedure.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC74_ProcQuery.phpt b/test/functional/sqlsrv/TC74_ProcQuery.phpt
index dfe868e3..cbc2fa20 100644
--- a/test/functional/sqlsrv/TC74_ProcQuery.phpt
+++ b/test/functional/sqlsrv/TC74_ProcQuery.phpt
@@ -7,7 +7,7 @@ Checks all numeric data types (i.e. 10 SQL types).
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC75_ProcRoundtrip.phpt b/test/functional/sqlsrv/TC75_ProcRoundtrip.phpt
index b2bf5a21..5caaea7c 100644
--- a/test/functional/sqlsrv/TC75_ProcRoundtrip.phpt
+++ b/test/functional/sqlsrv/TC75_ProcRoundtrip.phpt
@@ -6,7 +6,7 @@ Checks all character data types.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC76_StoredProcNull.phpt b/test/functional/sqlsrv/TC76_StoredProcNull.phpt
index 7a63b841..32a80f6f 100644
--- a/test/functional/sqlsrv/TC76_StoredProcNull.phpt
+++ b/test/functional/sqlsrv/TC76_StoredProcNull.phpt
@@ -5,7 +5,7 @@ Verifies the ability to return a null string from a stored procedure.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC78_RegressionVSTS611146.phpt b/test/functional/sqlsrv/TC78_RegressionVSTS611146.phpt
index f780e6e4..bafc3633 100644
--- a/test/functional/sqlsrv/TC78_RegressionVSTS611146.phpt
+++ b/test/functional/sqlsrv/TC78_RegressionVSTS611146.phpt
@@ -6,7 +6,7 @@ Checks all character data types.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC79_RegressionVSTS846501.phpt b/test/functional/sqlsrv/TC79_RegressionVSTS846501.phpt
index 196a5520..a5d0ef1c 100644
--- a/test/functional/sqlsrv/TC79_RegressionVSTS846501.phpt
+++ b/test/functional/sqlsrv/TC79_RegressionVSTS846501.phpt
@@ -6,7 +6,7 @@ Checks all character data types.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC81_MemoryCheck.phpt b/test/functional/sqlsrv/TC81_MemoryCheck.phpt
index 7ef3fc87..1e9bbff8 100644
--- a/test/functional/sqlsrv/TC81_MemoryCheck.phpt
+++ b/test/functional/sqlsrv/TC81_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.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC82_StoredProcRS.phpt b/test/functional/sqlsrv/TC82_StoredProcRS.phpt
index 36c7d703..c0e36401 100644
--- a/test/functional/sqlsrv/TC82_StoredProcRS.phpt
+++ b/test/functional/sqlsrv/TC82_StoredProcRS.phpt
@@ -5,7 +5,7 @@ Test output string parameters with rows affected return results before output pa
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/TC83_ComplexInsert.phpt b/test/functional/sqlsrv/TC83_ComplexInsert.phpt
index 327369c7..831b695d 100644
--- a/test/functional/sqlsrv/TC83_ComplexInsert.phpt
+++ b/test/functional/sqlsrv/TC83_ComplexInsert.phpt
@@ -5,7 +5,7 @@ Test the driver behavior with a complex insert query.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
diff --git a/test/functional/sqlsrv/sqlsrv_ae_insert_sqltype_numeric.phpt b/test/functional/sqlsrv/sqlsrv_ae_insert_sqltype_numeric.phpt
index 9b511d81..1948e001 100644
--- a/test/functional/sqlsrv/sqlsrv_ae_insert_sqltype_numeric.phpt
+++ b/test/functional/sqlsrv/sqlsrv_ae_insert_sqltype_numeric.phpt
@@ -45,14 +45,14 @@ foreach ($dataTypes as $dataType) {
 
         if (!AE\isColEncrypted()) {
             if ($r === false) {
-                $isCompatibleible = false;
+                $isCompatible = false;
                 foreach ($compatList[$dataType] as $compatType) {
                     if (stripos($compatType, $sqlType) !== false) {
-                        $isCompatibleible = true;
+                        $isCompatible = true;
                     }
                 }
                 // 22018 is the SQLSTATE for any incompatible conversion errors
-                if ($isCompatibleible && sqlsrv_errors()[0]['SQLSTATE'] == 22018) {
+                if ($isCompatible && sqlsrv_errors()[0]['SQLSTATE'] == 22018) {
                     echo "$sqlType should be compatible with $dataType\n";
                     $success = false;
                 }