diff --git a/ext/oci8/tests/drop_table.inc b/ext/oci8/tests/drop_table.inc
index ffd99f5af3d..592a95a3db6 100644
--- a/ext/oci8/tests/drop_table.inc
+++ b/ext/oci8/tests/drop_table.inc
@@ -1,12 +1,7 @@
 <?php
-
-    if ($c) {
-        $ora_sql = "DROP TABLE
-                                ".$schema.$table_name."
-                   ";
-                      
-        $statement = OCIParse($c,$ora_sql);
-        OCIExecute($statement);
-    }
-
+if ($c) {
+    $ora_sql = "DROP TABLE ".$schema.$table_name;                      
+    $statement = oci_parse($c,$ora_sql);
+    oci_execute($statement);
+}
 ?>
diff --git a/ext/oci8/tests/drop_type.inc b/ext/oci8/tests/drop_type.inc
index 047968ef28d..99e813c9fc9 100644
--- a/ext/oci8/tests/drop_type.inc
+++ b/ext/oci8/tests/drop_type.inc
@@ -1,12 +1,7 @@
 <?php
-
-    if ($c) {
-        $ora_sql = "DROP TYPE
-                                ".$type_name."
-                   ";
-                      
-        $statement = OCIParse($c,$ora_sql);
-        OCIExecute($statement);
+if ($c) {
+    $ora_sql = "DROP TYPE ".$type_name;
+    $statement = oci_parse($c,$ora_sql);
+    oci_execute($statement);
     }
-
 ?>
diff --git a/ext/oci8/tests/extauth_01.phpt b/ext/oci8/tests/extauth_01.phpt
index e054a221627..30250ec2435 100644
--- a/ext/oci8/tests/extauth_01.phpt
+++ b/ext/oci8/tests/extauth_01.phpt
@@ -139,12 +139,12 @@ bool(false)
 bool(false)
 Test 7
 
-Warning: oci_connect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
+Warning: oci_connect(): ORA-12154: %s in %s on line %d
 array(4) {
   [%u|b%"code"]=>
   int(12154)
   [%u|b%"message"]=>
-  %unicode|string%(65) "ORA-12154: %s"
+  %unicode|string%(%d) "ORA-12154: %s"
   [%u|b%"offset"]=>
   int(0)
   [%u|b%"sqltext"]=>
@@ -153,12 +153,12 @@ array(4) {
 bool(false)
 Test 8
 
-Warning: oci_connect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
+Warning: oci_connect(): ORA-12154: %s in %s on line %d
 array(4) {
   [%u|b%"code"]=>
   int(12154)
   [%u|b%"message"]=>
-  %unicode|string%(65) "ORA-12154: %s"
+  %unicode|string%(%d) "ORA-12154: %s"
   [%u|b%"offset"]=>
   int(0)
   [%u|b%"sqltext"]=>
diff --git a/ext/oci8/tests/extauth_02.phpt b/ext/oci8/tests/extauth_02.phpt
index b2752296111..d648eef08b1 100644
--- a/ext/oci8/tests/extauth_02.phpt
+++ b/ext/oci8/tests/extauth_02.phpt
@@ -139,12 +139,12 @@ bool(false)
 bool(false)
 Test 7
 
-Warning: oci_new_connect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
+Warning: oci_new_connect(): ORA-12154: %s in %s on line %d
 array(4) {
   [%u|b%"code"]=>
   int(12154)
   [%u|b%"message"]=>
-  %unicode|string%(65) "ORA-12154: %s"
+  %unicode|string%(%d) "ORA-12154: %s"
   [%u|b%"offset"]=>
   int(0)
   [%u|b%"sqltext"]=>
@@ -153,12 +153,12 @@ array(4) {
 bool(false)
 Test 8
 
-Warning: oci_new_connect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
+Warning: oci_new_connect(): ORA-12154: %s in %s on line %d
 array(4) {
   [%u|b%"code"]=>
   int(12154)
   [%u|b%"message"]=>
-  %unicode|string%(65) "ORA-12154: %s"
+  %unicode|string%(%d) "ORA-12154: %s"
   [%u|b%"offset"]=>
   int(0)
   [%u|b%"sqltext"]=>
diff --git a/ext/oci8/tests/extauth_03.phpt b/ext/oci8/tests/extauth_03.phpt
index 50be0e7243b..021492f765b 100644
--- a/ext/oci8/tests/extauth_03.phpt
+++ b/ext/oci8/tests/extauth_03.phpt
@@ -139,12 +139,12 @@ bool(false)
 bool(false)
 Test 7
 
-Warning: oci_pconnect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
+Warning: oci_pconnect(): ORA-12154: %s in %s on line %d
 array(4) {
   [%u|b%"code"]=>
   int(12154)
   [%u|b%"message"]=>
-  %unicode|string%(65) "ORA-12154: %s"
+  %unicode|string%(%d) "ORA-12154: %s"
   [%u|b%"offset"]=>
   int(0)
   [%u|b%"sqltext"]=>
@@ -153,12 +153,12 @@ array(4) {
 bool(false)
 Test 8
 
-Warning: oci_pconnect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
+Warning: oci_pconnect(): ORA-12154: %s in %s on line %d
 array(4) {
   [%u|b%"code"]=>
   int(12154)
   [%u|b%"message"]=>
-  %unicode|string%(65) "ORA-12154: %s"
+  %unicode|string%(%d) "ORA-12154: %s"
   [%u|b%"offset"]=>
   int(0)
   [%u|b%"sqltext"]=>