diff --git a/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_keywords.phpt b/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_keywords.phpt
index d2662c02..36a0883c 100644
--- a/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_keywords.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_keywords.phpt
@@ -1,15 +1,9 @@
 --TEST--
 Test connection keywords for Azure Key Vault for Always Encrypted.
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_mid-refactor.inc'); ?>
 --FILE--
 <?php
-// Skip for 32-bit PHP, as bug causes this test to fail when inserting a bigint
-if (PHP_INT_SIZE == 4) {
-    echo "Done.\n";
-    exit();
-}
-
 require_once("MsCommon_mid-refactor.inc");
 require_once("MsSetup.inc");
 require_once('values.php');
diff --git a/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_verification.phpt b/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_verification.phpt
index 3c4aa74b..4a1c6dfb 100644
--- a/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_verification.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_verification.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test credentials for Azure Key Vault for Always Encrypted.
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_mid-refactor.inc'); ?>
 --FILE--
 <?php
 // TODO: Fix the test on Ubuntu - right now it produces a SSL error on Ubuntu
diff --git a/test/functional/pdo_sqlsrv/skipif_mid-refactor.inc b/test/functional/pdo_sqlsrv/skipif_mid-refactor.inc
index a8e0e7d6..5c1e87a0 100644
--- a/test/functional/pdo_sqlsrv/skipif_mid-refactor.inc
+++ b/test/functional/pdo_sqlsrv/skipif_mid-refactor.inc
@@ -11,10 +11,6 @@ $conn = new PDO($dsn, $uid, $pwd);
 if (! $conn) {
     echo("Error: could not connect during SKIPIF!");
 } elseif (isColEncrypted()) {
-    if (!(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')) {
-        die( "Skip, AE test on windows only." );
-    }
-
     if (!isAEQualified($conn)) {
         die("skip - AE feature not supported in the current environment.");
     }
diff --git a/test/functional/pdo_sqlsrv/values.php b/test/functional/pdo_sqlsrv/values.php
index defd5d3b..5f2d745d 100644
--- a/test/functional/pdo_sqlsrv/values.php
+++ b/test/functional/pdo_sqlsrv/values.php
@@ -792,7 +792,7 @@ $small_values = array("qwerty",
                       52.7878, 
                       -1.79E+308, 
                       -3.4E+38, 
-                      -987654321987654321,
+                      PHP_INT_SIZE == 4 ? "-9223372036854775807" : -9223372036854775807,
                       987654321,
                       1,
                       );
diff --git a/test/functional/sqlsrv/skipif_versions_old.inc b/test/functional/sqlsrv/skipif_versions_old.inc
index 3605fb9f..2b9f8ded 100644
--- a/test/functional/sqlsrv/skipif_versions_old.inc
+++ b/test/functional/sqlsrv/skipif_versions_old.inc
@@ -10,10 +10,6 @@ $conn = AE\connect();
 if (! $conn) {
     echo("Error: could not connect during SKIPIF!");
 } elseif (AE\isColEncrypted()) {
-    if (!isWindows()) {
-        die( "Skip, AE test on windows only." );
-    }
-
     if (!AE\isQualified($conn)) {
         die("skip - AE feature not supported in the current environment.");
     }
diff --git a/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt b/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt
index c7070452..d5f7ef83 100644
--- a/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt
+++ b/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test connection keywords for Azure Key Vault for Always Encrypted.
 --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_azure_key_vault_verification.phpt b/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_verification.phpt
index c89fea89..086765f9 100644
--- a/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_verification.phpt
+++ b/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_verification.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test credentials for Azure Key Vault for Always Encrypted.
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 // TODO: Fix the test on Ubuntu - right now it produces a SSL error on Ubuntu
diff --git a/test/functional/sqlsrv/values.php b/test/functional/sqlsrv/values.php
index defd5d3b..5f2d745d 100644
--- a/test/functional/sqlsrv/values.php
+++ b/test/functional/sqlsrv/values.php
@@ -792,7 +792,7 @@ $small_values = array("qwerty",
                       52.7878, 
                       -1.79E+308, 
                       -3.4E+38, 
-                      -987654321987654321,
+                      PHP_INT_SIZE == 4 ? "-9223372036854775807" : -9223372036854775807,
                       987654321,
                       1,
                       );