diff --git a/ext/mysql/tests/mysql_errno.phpt b/ext/mysql/tests/mysql_errno.phpt
index 8284144c16b..8d19b3b31c4 100644
--- a/ext/mysql/tests/mysql_errno.phpt
+++ b/ext/mysql/tests/mysql_errno.phpt
@@ -2,39 +2,46 @@
 mysql_errno()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
-    include "connect.inc";
+include "connect.inc";
 
-    $tmp    = NULL;   
-    $link   = NULL;   
-    
-    if (false !== ($tmp = @mysql_errno()))
-        printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
-        
-    if (false !== ($tmp = @mysql_errno($link)))
-        printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+$tmp    = NULL;
+$link   = NULL;
 
-    if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket)) {
-        printf("[003] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
-            $host, $user, $db, $port, $socket);        
-    }
+if (false !== ($tmp = @mysql_errno()))
+	printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
 
-    var_dump(mysql_errno($link));
-        
-    if (!mysql_query('DROP TABLE IF EXISTS test', $link)) {
-        printf("[004] Failed to drop old test table: [%d] %s\n", mysql_errno($link), mysql_errno($link));
-    }        
+if (false !== ($tmp = @mysql_errno($link)))
+	printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
 
-    mysql_query('SELECT * FROM test', $link);
-    var_dump(mysql_errno($link));    
-        
-    mysql_close($link);
-    
-    var_dump(mysql_errno($link));
-    
-    print "done!";
+if (!is_null($tmp = @mysql_errno($link, 'too many args')))
+	printf("[002b] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket)) {
+	printf("[003] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+		$host, $user, $db, $port, $socket);
+}
+var_dump(mysql_errno($link));
+
+if (!mysql_query('DROP TABLE IF EXISTS test', $link)) {
+	printf("[004] Failed to drop old test table: [%d] %s\n", mysql_errno($link), mysql_errno($link));
+}
+
+mysql_query('SELECT * FROM test', $link);
+var_dump(mysql_errno($link));
+
+mysql_close($link);
+
+var_dump(mysql_errno($link));
+
+if ($link = @mysql_connect($host . '_unknown', $user . '_unknown', $passwd, true)) {
+	printf("[005] Can connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+		$host . '_unknown', $user . '_unknown', $db, $port, $socket);
+}
+var_dump(mysql_errno());
+
+print "done!";
 ?>
 --EXPECTF--
 int(0)
@@ -42,4 +49,5 @@ int(%d)
 
 Warning: mysql_errno(): %d is not a valid MySQL-Link resource in %s on line %d
 bool(false)
+int(%d)
 done!
\ No newline at end of file
diff --git a/ext/mysql/tests/mysql_error.phpt b/ext/mysql/tests/mysql_error.phpt
index 3b71e22146c..afdd90c338b 100644
--- a/ext/mysql/tests/mysql_error.phpt
+++ b/ext/mysql/tests/mysql_error.phpt
@@ -2,48 +2,57 @@
 mysql_error()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
-    include "connect.inc";
+include "connect.inc";
 
-    $tmp    = NULL;   
-    $link   = NULL;   
-    
-    if (false !== ($tmp = @mysql_error()))
-        printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
-        
-    if (false !== ($tmp = @mysql_error($link)))
-        printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+$tmp    = NULL;
+$link   = NULL;
 
-    if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket)) {
-        printf("[003] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
-            $host, $user, $db, $port, $socket);
-    }            
+if (false !== ($tmp = @mysql_error()))
+	printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
 
-    $tmp = mysql_error($link);
-    if (!is_string($tmp) || ('' !== $tmp))
-        printf("[004] Expecting string/empty, got %s/%s. [%d] %s\n", gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));        
-            
-    if (!mysql_query('DROP TABLE IF EXISTS test', $link)) {
-        printf("[005] Failed to drop old test table: [%d] %s\n", mysql_errno($link), mysql_error($link));
-    }        
-        
-    mysql_query('SELECT * FROM test', $link);
-    $tmp = mysql_error($link);
-    if (!is_string($tmp) || !preg_match("/Table '\w*\.test' doesn't exist/su", $tmp))
-        printf("[006] Expecting string/[Table... doesn't exit], got %s/%s. [%d] %s\n", gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));
-        
-    if (ini_get('unicode.semantics') && !is_unicode($tmp)) {
-        printf("[007] Expecting Unicode error message!\n");
-        var_inspect($tmp);
-    }
-            
-    mysql_close($link);
-    
-    var_dump(mysql_error($link));
-    
-    print "done!";
+if (false !== ($tmp = @mysql_error($link)))
+	printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!is_null($tmp = @mysql_error($link, 'too many args')))
+	printf("[002b] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket)) {
+	printf("[003] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+		$host, $user, $db, $port, $socket);
+}
+
+$tmp = mysql_error($link);
+if (!is_string($tmp) || ('' !== $tmp))
+	printf("[004] Expecting string/empty, got %s/%s. [%d] %s\n", gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));
+
+if (!mysql_query('DROP TABLE IF EXISTS test', $link)) {
+	printf("[005] Failed to drop old test table: [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+mysql_query('SELECT * FROM test', $link);
+$tmp = mysql_error($link);
+if (!is_string($tmp) || !preg_match("/Table '\w*\.test' doesn't exist/su", $tmp))
+	printf("[006] Expecting string/[Table... doesn't exit], got %s/%s. [%d] %s\n", gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));
+
+if (ini_get('unicode.semantics') && !is_unicode($tmp)) {
+	printf("[007] Expecting Unicode error message!\n");
+	var_inspect($tmp);
+}
+
+mysql_close($link);
+
+var_dump(mysql_error($link));
+
+if ($link = @mysql_connect($host . '_unknown', $user . '_unknown', $passwd, true)) {
+	printf("[008] Can connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+		$host . '_unknown', $user . '_unknown', $db, $port, $socket);
+}
+if ('' == mysql_error())
+	printf("[009] Connect error should have been set\n");
+
+print "done!";
 ?>
 --EXPECTF--
 Warning: mysql_error(): %d is not a valid MySQL-Link resource in %s on line %d