diff --git a/ext/pdo/tests/bug_73234.phpt b/ext/pdo/tests/bug_73234.phpt
index 451cc4849c42a..e3e3c0b2b8090 100644
--- a/ext/pdo/tests/bug_73234.phpt
+++ b/ext/pdo/tests/bug_73234.phpt
@@ -7,6 +7,11 @@ $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
+
+$db = PDOTest::factory();
+if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'oci') {
+    die("xfail PDO::PARAM_NULL is not honored by OCI driver, related with bug #81586");
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo/tests/gh8626.phpt b/ext/pdo/tests/gh8626.phpt
index a77b06a22e12b..b222120f33ae6 100644
--- a/ext/pdo/tests/gh8626.phpt
+++ b/ext/pdo/tests/gh8626.phpt
@@ -7,6 +7,11 @@ $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
+
+$db = PDOTest::factory();
+if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'oci') {
+    die("xfail OCI driver errorInfo is inconsistent with other PDO drivers");
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_oci/tests/pdo_oci_stream_2a.phpt b/ext/pdo_oci/tests/pdo_oci_stream_2.phpt
similarity index 60%
rename from ext/pdo_oci/tests/pdo_oci_stream_2a.phpt
rename to ext/pdo_oci/tests/pdo_oci_stream_2.phpt
index 163a2c5fee96e..2159e5fcdc062 100644
--- a/ext/pdo_oci/tests/pdo_oci_stream_2a.phpt
+++ b/ext/pdo_oci/tests/pdo_oci_stream_2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-PDO OCI: Inserts 1K with 1 number and 2 LOB columns (stress test)
+PDO OCI: Insert and fetch 1K records from a table that contains 1 number and 2 LOB columns (stress test)
 --SKIPIF--
 <?php
 if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) die('skip not loaded');
@@ -69,6 +69,57 @@ printf("Done\n");
 /* Cleanup is done in pdo_oci_stream_2b.phpt */
 //$db->exec("drop table pdo_oci_stream_2");
 
+$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);  // Let's use streams
+
+// Since each column only has one lob descriptor, the last row is
+// shown twice because the lob descriptor for each column is reused in
+// the stream
+
+$i = 0;
+$j = 9;
+$a_val = ord('a');
+foreach($db->query("select data1 as d4_1, data2 as d4_2 from pdo_oci_stream_2 order by id") as $row) {
+    $a = $row['d4_1'];
+    $a1 = $row['d4_2'];
+
+    $str1 = stream_get_contents($a);
+    $str2 = stream_get_contents($a1);
+
+    $str1len = strlen($str1);
+    $str2len = strlen($str2);
+
+    $b = ord($str1[0]);
+    $b1 = ord($str2[0]);
+
+    if (($b != ($a_val + $i)) && ($str1len != (4086 + $i)) &&
+        ($b1 != ($a_val + $j)) && ($str2len != (4086 + $j))) {
+        printf("There is a bug!\n");
+        printf("Col1:\n");
+        printf("a_val = %d\n", $a_val);
+        printf("b     = %d\n", $b);
+        printf("i     = %d\n", $i);
+        printf("str1len = %d\n", $str1len);
+
+        printf("Col2:\n");
+        printf("a_val = %d\n", $a_val);
+        printf("b1    = %d\n", $b1);
+        printf("j     = %d\n", $j);
+        printf("str2len = %d\n", $str1len);
+
+    }
+    $i++;
+    if ($i>9)
+        $i = 0;
+    $j--;
+    if ($j<0)
+        $j = 9;
+}
+echo "Fetch operation done!\n";
+
+/* Cleanup */
+$db->exec("drop table pdo_oci_stream_2");
+
 ?>
 --EXPECT--
 Inserting 1000 Records ... Done
+Fetch operation done!
diff --git a/ext/pdo_oci/tests/pdo_oci_stream_2b.phpt b/ext/pdo_oci/tests/pdo_oci_stream_2b.phpt
deleted file mode 100644
index de09c4872883b..0000000000000
--- a/ext/pdo_oci/tests/pdo_oci_stream_2b.phpt
+++ /dev/null
@@ -1,70 +0,0 @@
---TEST--
-PDO OCI: Fetches 1K records from a table that contains 1 number and 2 LOB columns (stress test)
---SKIPIF--
-<?php
-if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) die('skip not loaded');
-if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
-require(__DIR__.'/../../pdo/tests/pdo_test.inc');
-PDOTest::skip();
-?>
---FILE--
-<?php
-
-// !! Note: uses data inserted in pdo_oci_stream_2a.phpt !!
-
-require('ext/pdo/tests/pdo_test.inc');
-$db = PDOTest::test_factory('ext/pdo_oci/tests/common.phpt');
-
-$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);  // Let's use streams
-
-// Since each column only has one lob descriptor, the last row is
-// shown twice because the lob descriptor for each column is reused in
-// the stream
-
-$i = 0;
-$j = 9;
-$a_val = ord('a');
-foreach($db->query("select data1 as d4_1, data2 as d4_2 from pdo_oci_stream_2 order by id") as $row) {
-    $a = $row['d4_1'];
-    $a1 = $row['d4_2'];
-
-    $str1 = stream_get_contents($a);
-    $str2 = stream_get_contents($a1);
-
-    $str1len = strlen($str1);
-    $str2len = strlen($str2);
-
-    $b = ord($str1[0]);
-    $b1 = ord($str2[0]);
-
-    if (($b != ($a_val + $i)) && ($str1len != (4086 + $i)) &&
-        ($b1 != ($a_val + $j)) && ($str2len != (4086 + $j))) {
-        printf("There is a bug!\n");
-        printf("Col1:\n");
-        printf("a_val = %d\n", $a_val);
-        printf("b     = %d\n", $b);
-        printf("i     = %d\n", $i);
-        printf("str1len = %d\n", $str1len);
-
-        printf("Col2:\n");
-        printf("a_val = %d\n", $a_val);
-        printf("b1    = %d\n", $b1);
-        printf("j     = %d\n", $j);
-        printf("str2len = %d\n", $str1len);
-
-    }
-    $i++;
-    if ($i>9)
-        $i = 0;
-    $j--;
-    if ($j<0)
-        $j = 9;
-}
-echo "Fetch operation done!\n";
-
-/* Cleanup */
-$db->exec("drop table pdo_oci_stream_2");
-
-?>
---EXPECT--
-Fetch operation done!