diff --git a/test/functional/pdo_sqlsrv/PDO101_LargeColumnName.phpt b/test/functional/pdo_sqlsrv/PDO101_LargeColumnName.phpt
index b5019290..be6234f2 100644
--- a/test/functional/pdo_sqlsrv/PDO101_LargeColumnName.phpt
+++ b/test/functional/pdo_sqlsrv/PDO101_LargeColumnName.phpt
@@ -1,76 +1,77 @@
---TEST--
-PDO - Large Column Name Test
---DESCRIPTION--
-Verifies that long column names are supported (up to 128 chars).
---ENV--
-PHPT_EXEC=true
---SKIPIF--
-<?php require('skipif.inc'); ?>
---FILE--
+--TEST--
+PDO - Large Column Name Test
+--DESCRIPTION--
+Verifies that long column names are supported (up to 128 chars).
+--ENV--
+PHPT_EXEC=true
+--SKIPIF--
+<?php require('skipif.inc'); ?>
+--FILE--
 <?php
 
-include 'MsCommon.inc';
+require_once('MsCommon.inc');
 
-function LargeColumnNameTest($columnName, $expectfail)
+function largeColumnNameTest($columnName)
 {
     include 'MsSetup.inc';
 
     Setup();
 
-    $conn = Connect();
+    $conn = connect();
 
-    $tableName = "LargeColumnNameTest";
+    $tableName = "largeColumnNameTest";
 
-    DropTable($conn, $tableName);
+    dropTable($conn, $tableName);
 
     $conn->query("CREATE TABLE [$tableName] ([$columnName] int)");
 
-
     $conn->query("INSERT INTO [$tableName] ([$columnName]) VALUES (5)");
 
     $stmt = $conn->query("SELECT * from [$tableName]");
 
-    if ( null == $stmt ) 
-    {
-        if (!$expectfail)
-            FatalError("Possible regression: Unable to retrieve inserted value.");
-    }
-    
-    DropTable($conn, $tableName);
-
+    dropTable($conn, $tableName);
 }
 
 
 //--------------------------------------------------------------------
-// Repro
+// repro
 //
 //--------------------------------------------------------------------
-function Repro()
+function repro()
 {
-    
     $testName = "PDO - Large Column Name Test";
 
-    StartTest($testName);
+    startTest($testName);
+
+    // The maximum size of a column name is 128 characters 
+    $maxlen = 128;
+    $columnName = str_repeat('A', $maxlen);
 
-    $columnName = "a";
-
-    try
-    {
-        for ($a = 1; $a <= 128; $a++)
-        {
-            LargeColumnNameTest($columnName, $a > 128);
-            $columnName .= "A";
-        }
-    }
-    catch (Exception $e)
-    {
-        echo $e->getMessage();
+    try {
+        largeColumnNameTest($columnName);
+    } catch (Exception $e) {
+        echo "Possible regression: Unable to retrieve inserted value\n";
+        print_r($e->getMessage());
+        echo "\n";
     }
+
+    // Now add another character to the name
+    $columnName .= 'A';
+    try {
+        largeColumnNameTest($columnName);
+    } catch (Exception $e) {
+        // Expects to fail 
+        $expected = 'is too long. Maximum length is 128.';
+        if (strpos($e->getMessage(), $expected) === false) {
+            print_r($e->getMessage());
+            echo "\n";
+        }
+    }
 
-    EndTest($testName);
+    endTest($testName);
 }
 
-Repro();
-?>
---EXPECT--
-Test "PDO - Large Column Name Test" completed successfully.
+repro();
+?>
+--EXPECT--
+Test "PDO - Large Column Name Test" completed successfully.
diff --git a/test/functional/pdo_sqlsrv/PDO101_LargeColumnName_unicode_col_name.phpt b/test/functional/pdo_sqlsrv/PDO101_LargeColumnName_unicode_col_name.phpt
index 634dc527..9ad27164 100644
--- a/test/functional/pdo_sqlsrv/PDO101_LargeColumnName_unicode_col_name.phpt
+++ b/test/functional/pdo_sqlsrv/PDO101_LargeColumnName_unicode_col_name.phpt
@@ -8,69 +8,70 @@ PHPT_EXEC=true
 <?php require('skipif.inc'); ?>
 --FILE--
 <?php
+require_once('MsCommon.inc');
 
-include 'MsCommon.inc';
-
-function LargeColumnNameTest($columnName, $expectfail)
+function largeColumnNameTest($columnName)
 {
     include 'MsSetup.inc';
 
     Setup();
 
-    $conn = Connect();
+    $conn = connect();
 
-    $tableName = "LargeColumnNameTest";
+    $tableName = "largeColumnNameTest";
 
-    DropTable($conn, $tableName);
+    dropTable($conn, $tableName);
 
     $conn->query("CREATE TABLE [$tableName] ([$columnName] int)");
 
-
     $conn->query("INSERT INTO [$tableName] ([$columnName]) VALUES (5)");
 
     $stmt = $conn->query("SELECT * from [$tableName]");
 
-    if ( null == $stmt ) 
-    {
-        if (!$expectfail)
-            FatalError("Possible regression: Unable to retrieve inserted value.");
-    }
-    
-    DropTable($conn, $tableName);
-
+    dropTable($conn, $tableName);
 }
 
 
 //--------------------------------------------------------------------
-// Repro
+// repro
 //
 //--------------------------------------------------------------------
-function Repro()
+function repro()
 {
-    
     $testName = "PDO - Large Column Name Test";
 
-    StartTest($testName);
+    startTest($testName);
 
-    $columnName = "是";
+    // The maximum size of a column name is 128 characters 
+    $maxlen = 128;
+    $columnName = str_repeat('是', $maxlen);
 
-    try
-    {
-        for ($a = 1; $a <= 128; $a++)
-        {
-            LargeColumnNameTest($columnName, $a > 128);
-            $columnName .= "是";
+    try {
+        largeColumnNameTest($columnName);
+    } catch (Exception $e) {
+        echo "Possible regression: Unable to retrieve inserted value\n";
+        print_r($e->getMessage());
+        echo "\n";
+    }
+
+    // Now add another character to the name
+    $columnName .= '是';
+    try {
+        largeColumnNameTest($columnName);
+    } catch (Exception $e) {
+        // Expects to fail 
+        $expected = 'is too long. Maximum length is 128.';
+        if (strpos($e->getMessage(), $expected) === false) {
+            print_r($e->getMessage());
+            echo "\n";
         }
     }
-    catch (Exception $e)
-    {
-        echo $e->getMessage();
-    }
 
-    EndTest($testName);
+    endTest($testName);
 }
 
-Repro();
+repro();
+
 ?>
 --EXPECT--
 Test "PDO - Large Column Name Test" completed successfully.