diff --git a/ext/mysqli/tests/bug46614.phpt b/ext/mysqli/tests/bug46614.phpt
index 89392d969d5c0..00e4b508c2146 100644
--- a/ext/mysqli/tests/bug46614.phpt
+++ b/ext/mysqli/tests/bug46614.phpt
@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
-if (!defined("MYSQLI_ASYNC")) {
-    die("skip mysqlnd only");
-}
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/bug47050.phpt b/ext/mysqli/tests/bug47050.phpt
index 35a3a23c9f092..293613bfa41ad 100644
--- a/ext/mysqli/tests/bug47050.phpt
+++ b/ext/mysqli/tests/bug47050.phpt
@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
-if (!defined("MYSQLI_ASYNC")) {
-    die("skip mysqlnd only");
-}
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/bug73800.phpt b/ext/mysqli/tests/bug73800.phpt
index 65f67f366d677..96d1f403b01fa 100644
--- a/ext/mysqli/tests/bug73800.phpt
+++ b/ext/mysqli/tests/bug73800.phpt
@@ -6,7 +6,6 @@ mysqli
 <?php
 require_once 'skipifconnectfailure.inc';
 if (PHP_INT_SIZE != 8) die('skip requires 64-bit');
-if (!defined('MYSQLI_OPT_INT_AND_FLOAT_NATIVE')) die('skip requires mysqlnd');
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/bug77597.phpt b/ext/mysqli/tests/bug77597.phpt
index bc9de640ea211..406403acec771 100644
--- a/ext/mysqli/tests/bug77597.phpt
+++ b/ext/mysqli/tests/bug77597.phpt
@@ -5,7 +5,6 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
-if (!defined('MYSQLI_STORE_RESULT_COPY_DATA')) die('skip requires mysqlnd');
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/bug79375.phpt b/ext/mysqli/tests/bug79375.phpt
index e3a02d570ce10..f6531f0216bd7 100644
--- a/ext/mysqli/tests/bug79375.phpt
+++ b/ext/mysqli/tests/bug79375.phpt
@@ -6,7 +6,6 @@ mysqli
 <?php
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 require_once 'skipifconnectfailure.inc';
-if (!defined('MYSQLI_STORE_RESULT_COPY_DATA')) die('skip requires mysqlnd');
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/bug80837.phpt b/ext/mysqli/tests/bug80837.phpt
index b8ad59eea231c..09411ac2f4ecb 100644
--- a/ext/mysqli/tests/bug80837.phpt
+++ b/ext/mysqli/tests/bug80837.phpt
@@ -5,7 +5,6 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
-if (!defined('MYSQLI_STORE_RESULT_COPY_DATA')) die('skip requires mysqlnd');
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/deprecated_constants.phpt b/ext/mysqli/tests/deprecated_constants.phpt
index 81c5f3982f0c2..9c8e06e50fe1c 100644
--- a/ext/mysqli/tests/deprecated_constants.phpt
+++ b/ext/mysqli/tests/deprecated_constants.phpt
@@ -9,13 +9,8 @@ echo constant('MYSQLI_NO_DATA')."\n";
 echo constant('MYSQLI_DATA_TRUNCATED')."\n";
 echo constant('MYSQLI_SERVER_QUERY_NO_GOOD_INDEX_USED')."\n";
 echo constant('MYSQLI_SERVER_QUERY_NO_INDEX_USED')."\n";
-if (stristr(mysqli_get_client_info(), 'mysqlnd')) {
-    echo constant('MYSQLI_SERVER_QUERY_WAS_SLOW')."\n";
-    echo constant('MYSQLI_SERVER_PS_OUT_PARAMS')."\n";
-} else {
-    print("\nDeprecated: Constant MYSQLI_SERVER_QUERY_WAS_SLOW is deprecated in dummy\n-1\n");
-    print("\nDeprecated: Constant MYSQLI_SERVER_PS_OUT_PARAMS is deprecated in dummy\n-1\n");
-}
+echo constant('MYSQLI_SERVER_QUERY_WAS_SLOW')."\n";
+echo constant('MYSQLI_SERVER_PS_OUT_PARAMS')."\n";
 echo constant('MYSQLI_IS_MARIADB')."\n";
 
 ?>
diff --git a/ext/mysqli/tests/mysqli_explain_metadata.phpt b/ext/mysqli/tests/mysqli_explain_metadata.phpt
index 320f2c7124599..a5ddf5462a511 100644
--- a/ext/mysqli/tests/mysqli_explain_metadata.phpt
+++ b/ext/mysqli/tests/mysqli_explain_metadata.phpt
@@ -95,8 +95,7 @@ require_once 'skipifconnectfailure.inc';
             var_dump($fields);
         }
 
-        if (function_exists('mysqli_stmt_get_result') &&
-            $stmt->prepare('EXPLAIN SELECT t1.*, t2.* FROM test AS t1, test AS t2') &&
+        if ($stmt->prepare('EXPLAIN SELECT t1.*, t2.* FROM test AS t1, test AS t2') &&
             $stmt->execute()) {
             if (!$res_stmt = mysqli_stmt_get_result($stmt)) {
                 printf("[017] Cannot fetch result from PS [%d] %s\n",
diff --git a/ext/mysqli/tests/mysqli_get_client_stats.phpt b/ext/mysqli/tests/mysqli_get_client_stats.phpt
index 141a390127169..a8d509eb62760 100644
--- a/ext/mysqli/tests/mysqli_get_client_stats.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats.phpt
@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?PHP
 require_once 'skipifconnectfailure.inc';
-if (!function_exists('mysqli_get_client_stats')) {
-    die("skip only available with mysqlnd");
-}
 ?>
 --INI--
 mysqlnd.collect_statistics=1
diff --git a/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt b/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt
index d4cdfabc28d02..35ab6c617e96b 100644
--- a/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt
@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?PHP
 require_once 'skipifconnectfailure.inc';
-if (!function_exists('mysqli_get_client_stats')) {
-    die("skip only available with mysqlnd");
-}
 ?>
 --INI--
 mysqlnd.collect_statistics=1
diff --git a/ext/mysqli/tests/mysqli_get_client_stats_off.phpt b/ext/mysqli/tests/mysqli_get_client_stats_off.phpt
index 67459a8799c8c..ebb199d90f2c4 100644
--- a/ext/mysqli/tests/mysqli_get_client_stats_off.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats_off.phpt
@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?PHP
 require_once 'skipifconnectfailure.inc';
-if (!function_exists('mysqli_get_client_stats')) {
-    die("skip only available with mysqlnd");
-}
 ?>
 --INI--
 mysqlnd.collect_statistics=0
diff --git a/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt b/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt
index bfa8cc370c28d..c0f6ddb3c3544 100644
--- a/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt
@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?PHP
 require_once 'skipifconnectfailure.inc';
-if (!function_exists('mysqli_get_client_stats')) {
-    die("skip only available with mysqlnd");
-}
 ?>
 --INI--
 mysqlnd.collect_statistics=1
diff --git a/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt b/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt
index babf964fdaab5..aaf4098859132 100644
--- a/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt
@@ -8,9 +8,6 @@ mysqli
 --SKIPIF--
 <?PHP
 require_once 'skipifconnectfailure.inc';
-if (!function_exists('mysqli_get_client_stats')) {
-    die("skip only available with mysqlnd");
-}
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_get_connection_stats.phpt b/ext/mysqli/tests/mysqli_get_connection_stats.phpt
index dfca21c222ab7..b56cd448c12c8 100644
--- a/ext/mysqli/tests/mysqli_get_connection_stats.phpt
+++ b/ext/mysqli/tests/mysqli_get_connection_stats.phpt
@@ -8,9 +8,6 @@ mysqli
 --SKIPIF--
 <?PHP
 require_once 'skipifconnectfailure.inc';
-if (!function_exists('mysqli_get_connection_stats')) {
-    die("skip only available with mysqlnd");
-}
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt b/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt
index ca9642a1ef351..34888c4396ebf 100644
--- a/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt
+++ b/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt
@@ -8,9 +8,6 @@ mysqli
 --SKIPIF--
 <?PHP
 require_once 'skipifconnectfailure.inc';
-if (!function_exists('mysqli_get_connection_stats')) {
-    die("skip only available with mysqlnd");
-}
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt
index 3d9795db4d6b5..935e541b78979 100644
--- a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt
@@ -63,43 +63,39 @@ if (mysqli_get_server_version($link) <= 50000) {
     }
 
 
-    if (function_exists('mysqli_stmt_get_result')) {
-
-        if (!mysqli_query($link, 'DROP PROCEDURE IF EXISTS p'))
-            printf("[019] [%d] %s.\n", mysqli_errno($link), mysqli_error($link));
-
-        if (mysqli_real_query($link, 'CREATE PROCEDURE p(OUT ver_param VARCHAR(25)) BEGIN SELECT VERSION() INTO ver_param; END;')) {
-            // no result set, one output parameter
-            if (!$stmt = mysqli_prepare($link, 'CALL p(@version)'))
-                printf("[020] Cannot prepare CALL, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    if (!mysqli_query($link, 'DROP PROCEDURE IF EXISTS p'))
+        printf("[019] [%d] %s.\n", mysqli_errno($link), mysqli_error($link));
 
-            if (!mysqli_stmt_execute($stmt))
-                printf("[021] Cannot execute CALL, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+    if (mysqli_real_query($link, 'CREATE PROCEDURE p(OUT ver_param VARCHAR(25)) BEGIN SELECT VERSION() INTO ver_param; END;')) {
+        // no result set, one output parameter
+        if (!$stmt = mysqli_prepare($link, 'CALL p(@version)'))
+            printf("[020] Cannot prepare CALL, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
-            if (!mysqli_stmt_close($stmt))
-                printf("[022] Cannot close statement, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+        if (!mysqli_stmt_execute($stmt))
+            printf("[021] Cannot execute CALL, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
 
-            if (!$stmt = mysqli_prepare($link, 'SELECT @version AS _version'))
-                printf("[023] Cannot prepare SELECT, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+        if (!mysqli_stmt_close($stmt))
+            printf("[022] Cannot close statement, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
 
-            if (!mysqli_stmt_execute($stmt))
-                printf("[024] Cannot execute SELECT, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+        if (!$stmt = mysqli_prepare($link, 'SELECT @version AS _version'))
+            printf("[023] Cannot prepare SELECT, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
-            if (!$res = mysqli_stmt_get_result($stmt))
-                printf("[025] Cannot get result set, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+        if (!mysqli_stmt_execute($stmt))
+            printf("[024] Cannot execute SELECT, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
 
-            if ((!($row = mysqli_fetch_assoc($res))) || ($row['_version'] == ""))
-                printf("[026] Results seem wrong, got %s, [%d] %s\n",
-                    $row['_version'],
-                    mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+        if (!$res = mysqli_stmt_get_result($stmt))
+            printf("[025] Cannot get result set, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
 
-            mysqli_free_result($res);
-            mysqli_stmt_close($stmt);
+        if ((!($row = mysqli_fetch_assoc($res))) || ($row['_version'] == ""))
+            printf("[026] Results seem wrong, got %s, [%d] %s\n",
+                $row['_version'],
+                mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
 
-        } else {
-            printf("[027] Cannot create SP, [%d] %s.\n", mysqli_errno($link), mysqli_error($link));
-        }
+        mysqli_free_result($res);
+        mysqli_stmt_close($stmt);
 
+    } else {
+        printf("[027] Cannot create SP, [%d] %s.\n", mysqli_errno($link), mysqli_error($link));
     }
 
     if (!mysqli_query($link, 'DROP PROCEDURE IF EXISTS p'))
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result.phpt b/ext/mysqli/tests/mysqli_stmt_get_result.phpt
index 71a0b462a03a0..506ad1b7c366c 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result.phpt
@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
-
-if (!function_exists('mysqli_stmt_get_result'))
-    die('skip mysqli_stmt_get_result not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result2.phpt b/ext/mysqli/tests/mysqli_stmt_get_result2.phpt
index e116353bb8f4b..a5352af94db8f 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result2.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result2.phpt
@@ -5,8 +5,6 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
-if (!function_exists('mysqli_stmt_get_result'))
-    die('skip mysqli_stmt_get_result not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt
index a6bd7c55bb462..ae21ef2ad2864 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt
@@ -4,10 +4,6 @@ Fetching BIT column values using the PS API
 mysqli
 --SKIPIF--
 <?php
-if (!function_exists('mysqli_stmt_get_result')) {
-    die("skip mysqli_stmt_get_result() not available");
-}
-
 require_once 'connect.inc';
 if (!$link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
     die(sprintf("skip Can't connect to MySQL Server - [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt
index 0e58eb63665e6..bc5bfea1b29e9 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt
@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?php
     require_once 'skipifconnectfailure.inc';
-
-    if (!function_exists('mysqli_stmt_get_result'))
-        die('skip mysqli_stmt_get_result not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt
index b2fe144dd37d9..3d94297bf3985 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt
@@ -6,9 +6,6 @@ mysqli
 <?php
     require_once 'skipifconnectfailure.inc';
 
-    if (!function_exists('mysqli_stmt_get_result'))
-        die("skip mysqli_stmt_get_result() not available");
-
     if (!defined("MYSQLI_TYPE_GEOMETRY"))
         die("skip MYSQLI_TYPE_GEOMETRY not defined");
 ?>
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt
index 37afd39d15e41..5a2ac21ff97c1 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt
@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
-
-if (!function_exists('mysqli_stmt_get_result'))
-    die('skip mysqli_stmt_get_result not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt
index c50c99b9eac61..dcc72108c7ef4 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt
@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
-
-if (!function_exists('mysqli_stmt_get_result'))
-    die('skip mysqli_stmt_get_result not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt
index b633f43d0cc4c..b47264d5222d5 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt
@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
-
-if (!function_exists('mysqli_stmt_get_result'))
-    die('skip mysqli_stmt_get_result not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt
index 5ebdf7e0749f8..987d1b2c082e3 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt
@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
-
-if (!function_exists('mysqli_stmt_get_result'))
-    die('skip mysqli_stmt_get_result not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt
index dff2fa383c8db..d2ae94c5f94b5 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt
@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?php
     require_once 'skipifconnectfailure.inc';
-
-    if (!function_exists('mysqli_stmt_get_result'))
-        die("skip mysqli_stmt_get_result() not available");
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt
index 2fade6aabf17e..fa1e6264107ba 100644
--- a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt
@@ -83,86 +83,82 @@ die("skip Check again when the Klingons visit earth - http://bugs.mysql.com/bug.
             }
         }
 
-        if (function_exists('mysqli_stmt_get_result')) {
-            /* mysqlnd only */
-            if (!mysqli_stmt_execute($stmt)) {
-                printf("[%04d - %s] [%d] %s\n",
-                    $offset + 6, $sql,
-                    mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
-                return false;
-            }
-
-            $res = mysqli_stmt_get_result($stmt);
-            if (false === $res && !empty($expected_mysqlnd)) {
-                printf("[%04d - %s] Expecting resultset [%d] %s\n",
-                    $offset + 7, $sql,
-                    mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
-                return false;
-            } else if (empty($expected_mysqlnd) && false !== $res) {
-                printf("[%04d - %s] Unexpected resultset [%d] %s\n",
-                    $offset + 8, $sql,
-                    mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
-                return false;
-            }
+        if (!mysqli_stmt_execute($stmt)) {
+            printf("[%04d - %s] [%d] %s\n",
+                $offset + 6, $sql,
+                mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+            return false;
+        }
 
-            if (!is_object($res)) {
-                printf("[%04d - %s] [%d] %s\n",
-                    $offset + 9, $sql,
-                    mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
-                return false;
-            }
-            if ('mysqli_result' != get_class($res)) {
-                printf("[%04d - %s] Expecting object/mysqli_result got object/%s\n",
-                    $offset + 10, $sql,
-                    get_class($res));
-                return false;
-            }
+        $res = mysqli_stmt_get_result($stmt);
+        if (false === $res && !empty($expected_mysqlnd)) {
+            printf("[%04d - %s] Expecting resultset [%d] %s\n",
+                $offset + 7, $sql,
+                mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+            return false;
+        } else if (empty($expected_mysqlnd) && false !== $res) {
+            printf("[%04d - %s] Unexpected resultset [%d] %s\n",
+                $offset + 8, $sql,
+                mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+            return false;
+        }
 
-            $meta_res = array(
-                'num_fields'		=> mysqli_num_fields($res),
-                'fetch_field'		=> mysqli_fetch_field($res),
-                'fetch_field_direct0'	=> mysqli_fetch_field_direct($res, 0),
-                'fetch_field_direct1'	=> @mysqli_fetch_field_direct($res, 1),
-                'fetch_fields'		=> count(mysqli_fetch_fields($res)),
-                'field_count'		=> mysqli_field_count($link),
-                'field_seek-1'		=> @mysqli_field_seek($res, -1),
-                'field_seek0'		=> mysqli_field_seek($res, 0),
-                'field_tell'		=> mysqli_field_tell($res),
-            );
-            if (is_object($meta_res['fetch_field'])) {
-                $meta_res['fetch_field']->charsetnr	= 'ignore';
-                $meta_res['fetch_field']->flags	= 'ignore';
-            }
-            if (is_object($meta_res['fetch_field_direct0'])) {
-                $meta_res['fetch_field_direct0']->charsetnr	= 'ignore';
-                $meta_res['fetch_field_direct0']->flags	= 'ignore';
-            }
-            if (is_object($meta_res['fetch_field_direct1'])) {
-                $meta_res['fetch_field_direct1']->charsetnr	= 'ignore';
-                $meta_res['fetch_field_direct1']->flags	= 'ignore';
-            }
-            mysqli_free_result($res);
-            if ($check_mysqlnd && $meta_res != $expected_mysqlnd) {
-                printf("[%04d - %s] Metadata differs from expected\n",
-                    $offset + 11, $sql);
-                var_dump($meta_res);
-                var_dump($expected_mysqlnd);
-            } else {
-                if ($meta_res['field_count'] < 1) {
-                    printf("[%04d - %s] Metadata seems wrong, no fields?\n",
-                    $offset + 12, $sql);
-                    var_dump($meta_res);
-                    var_dump(mysqli_fetch_assoc($res));
-                }
-            }
+        if (!is_object($res)) {
+            printf("[%04d - %s] [%d] %s\n",
+                $offset + 9, $sql,
+                mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+            return false;
+        }
+        if ('mysqli_result' != get_class($res)) {
+            printf("[%04d - %s] Expecting object/mysqli_result got object/%s\n",
+                $offset + 10, $sql,
+                get_class($res));
+            return false;
+        }
 
-            if ($compare && $meta_res != $meta) {
-                printf("[%04d - %s] Metadata returned by mysqli_stmt_result_metadata() and mysqli_stmt_get_result() differ\n",
-                    $offset + 13, $sql);
+        $meta_res = array(
+            'num_fields'		=> mysqli_num_fields($res),
+            'fetch_field'		=> mysqli_fetch_field($res),
+            'fetch_field_direct0'	=> mysqli_fetch_field_direct($res, 0),
+            'fetch_field_direct1'	=> @mysqli_fetch_field_direct($res, 1),
+            'fetch_fields'		=> count(mysqli_fetch_fields($res)),
+            'field_count'		=> mysqli_field_count($link),
+            'field_seek-1'		=> @mysqli_field_seek($res, -1),
+            'field_seek0'		=> mysqli_field_seek($res, 0),
+            'field_tell'		=> mysqli_field_tell($res),
+        );
+        if (is_object($meta_res['fetch_field'])) {
+            $meta_res['fetch_field']->charsetnr	= 'ignore';
+            $meta_res['fetch_field']->flags	= 'ignore';
+        }
+        if (is_object($meta_res['fetch_field_direct0'])) {
+            $meta_res['fetch_field_direct0']->charsetnr	= 'ignore';
+            $meta_res['fetch_field_direct0']->flags	= 'ignore';
+        }
+        if (is_object($meta_res['fetch_field_direct1'])) {
+            $meta_res['fetch_field_direct1']->charsetnr	= 'ignore';
+            $meta_res['fetch_field_direct1']->flags	= 'ignore';
+        }
+        mysqli_free_result($res);
+        if ($check_mysqlnd && $meta_res != $expected_mysqlnd) {
+            printf("[%04d - %s] Metadata differs from expected\n",
+                $offset + 11, $sql);
+            var_dump($meta_res);
+            var_dump($expected_mysqlnd);
+        } else {
+            if ($meta_res['field_count'] < 1) {
+                printf("[%04d - %s] Metadata seems wrong, no fields?\n",
+                $offset + 12, $sql);
                 var_dump($meta_res);
-                var_dump($meta);
+                var_dump(mysqli_fetch_assoc($res));
             }
+        }
 
+        if ($compare && $meta_res != $meta) {
+            printf("[%04d - %s] Metadata returned by mysqli_stmt_result_metadata() and mysqli_stmt_get_result() differ\n",
+                $offset + 13, $sql);
+            var_dump($meta_res);
+            var_dump($meta);
         }
 
         mysqli_stmt_close($stmt);
diff --git a/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt b/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt
index a1ee318237088..f68d01a62dba9 100644
--- a/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt
+++ b/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt
@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
-if (!defined('MYSQLI_STORE_RESULT_COPY_DATA')) {
-    die("skip Requires MYSQLI_STORE_RESULT_COPY_DATA");
-}
 ?>
 --FILE--
 <?php