diff --git a/sapi/cli/tests/bug67429.phpt b/sapi/cli/tests/bug67429.phpt
deleted file mode 100644
index a047de6e314..00000000000
--- a/sapi/cli/tests/bug67429.phpt
+++ /dev/null
@@ -1,55 +0,0 @@
---TEST--
-FR #67429 (CLI server is missing some new HTTP response codes)
---SKIPIF--
-<?php
-include "skipif.inc";
-?>
---FILE--
-<?php
-include "php_cli_server.inc";
-
-// This creates a new server for each response code
-foreach ([308, 426] as $code) {
-  $proc_handle = php_cli_server_start(<<<PHP
-http_response_code($code);
-PHP
-  );
-
-  list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS);
-  $port = intval($port)?:80;
-
-  $fp = fsockopen($host, $port, $errno, $errstr, 0.5);
-  if (!$fp) {
-    die("connect failed");
-  }
-
-  if(fwrite($fp, <<<HEADER
-GET / HTTP/1.1
-
-
-HEADER
-  )) {
-      while (!feof($fp)) {
-          echo fgets($fp);
-      }
-  }
-
-  fclose($fp);
-  // Shutdown the servers or another server may not be able to start
-  // because of the this server still being bound to the port
-
-  php_cli_server_stop($proc_handle);
-}
-?>
---EXPECTF--
-HTTP/1.1 308 Permanent Redirect
-Date: %s
-Connection: close
-X-Powered-By: %s
-Content-type: text/html; charset=UTF-8
-
-HTTP/1.1 426 Upgrade Required
-Date: %s
-Connection: close
-X-Powered-By: %s
-Content-type: text/html; charset=UTF-8
diff --git a/sapi/cli/tests/bug67429_1.phpt b/sapi/cli/tests/bug67429_1.phpt
new file mode 100644
index 00000000000..8f3d6c79bc4
--- /dev/null
+++ b/sapi/cli/tests/bug67429_1.phpt
@@ -0,0 +1,42 @@
+--TEST--
+FR #67429 (CLI server is missing some new HTTP response codes)
+--SKIPIF--
+<?php
+include "skipif.inc";
+?>
+--FILE--
+<?php
+include "php_cli_server.inc";
+
+$proc_handle = php_cli_server_start(<<<PHP
+http_response_code(308);
+PHP
+);
+
+list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS);
+$port = intval($port)?:80;
+
+$fp = fsockopen($host, $port, $errno, $errstr, 0.5);
+if (!$fp) {
+  die("connect failed");
+}
+
+if(fwrite($fp, <<<HEADER
+GET / HTTP/1.1
+
+
+HEADER
+)) {
+    while (!feof($fp)) {
+        echo fgets($fp);
+    }
+}
+
+fclose($fp);
+?>
+--EXPECTF--
+HTTP/1.1 308 Permanent Redirect
+Date: %s
+Connection: close
+X-Powered-By: %s
+Content-type: text/html; charset=UTF-8
diff --git a/sapi/cli/tests/bug67429_2.phpt b/sapi/cli/tests/bug67429_2.phpt
new file mode 100644
index 00000000000..77447686a4f
--- /dev/null
+++ b/sapi/cli/tests/bug67429_2.phpt
@@ -0,0 +1,42 @@
+--TEST--
+FR #67429 (CLI server is missing some new HTTP response codes)
+--SKIPIF--
+<?php
+include "skipif.inc";
+?>
+--FILE--
+<?php
+include "php_cli_server.inc";
+
+$proc_handle = php_cli_server_start(<<<PHP
+http_response_code(426);
+PHP
+);
+
+list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS);
+$port = intval($port)?:80;
+
+$fp = fsockopen($host, $port, $errno, $errstr, 0.5);
+if (!$fp) {
+  die("connect failed");
+}
+
+if(fwrite($fp, <<<HEADER
+GET / HTTP/1.1
+
+
+HEADER
+)) {
+    while (!feof($fp)) {
+        echo fgets($fp);
+    }
+}
+
+fclose($fp);
+?>
+--EXPECTF--
+HTTP/1.1 426 Upgrade Required
+Date: %s
+Connection: close
+X-Powered-By: %s
+Content-type: text/html; charset=UTF-8
diff --git a/sapi/cli/tests/php_cli_server.inc b/sapi/cli/tests/php_cli_server.inc
index 1f7091be5c5..6421978a374 100644
--- a/sapi/cli/tests/php_cli_server.inc
+++ b/sapi/cli/tests/php_cli_server.inc
@@ -109,21 +109,4 @@ php_cli_server_start_error:
 
     return $handle;
 }
-
-function php_cli_server_stop($handle) {
-    $success = FALSE;
-    if ($handle) {
-        proc_terminate($handle);
-        /* Wait for server to shutdown */
-        for ($i = 0; $i < 60; $i++) {
-            $status = proc_get_status($handle);
-            if (!($status && $status['running'])) {
-                $success = TRUE;
-                break;
-            }
-            usleep(50000);
-        }
-    }
-    return $success;
-}
 ?>