diff --git a/ext/mysql/tests/mysql_num_fields.phpt b/ext/mysql/tests/mysql_num_fields.phpt
index 8de78fb0270..e32ca7a2ebe 100644
--- a/ext/mysql/tests/mysql_num_fields.phpt
+++ b/ext/mysql/tests/mysql_num_fields.phpt
@@ -2,48 +2,47 @@
 mysql_num_fields()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
-    include "connect.inc";
+include "connect.inc";
 
-    $tmp    = NULL;   
-    $link   = NULL;    
-    
-    if (!is_null($tmp = @mysql_num_fields()))
-        printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-        
-    if (false !== ($tmp = @mysql_num_fields($link)))
-        printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+$tmp    = NULL;
+$link   = NULL;
 
-    require('table.inc');
+if (!is_null($tmp = @mysql_num_fields()))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 
-    function func_test_mysql_num_fields($link, $query, $expected, $offset, $test_free = false) {
+if (false !== ($tmp = @mysql_num_fields($link)))
+	printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
 
-        if (!($res = mysql_query($query, $link))) {
-            printf("[%03d] [%d] %s\n", $offset, mysql_errno($link), mysql_error($link));
-            return;
-        }
+require('table.inc');
 
-        if ($expected !== ($tmp = mysql_num_fields($res)))
-            printf("[%03d] Expecting %s/%d, got %s/%d\n", $offset + 1, 
-                gettype($expected), $expected,
-                gettype($tmp), $tmp);
+function func_test_mysql_num_fields($link, $query, $expected, $offset, $test_free = false) {
 
-        mysql_free_result($res);
+if (!($res = mysql_query($query, $link))) {
+	printf("[%03d] [%d] %s\n", $offset, mysql_errno($link), mysql_error($link));
+	return;
+}
 
-        if ($test_free && (false !== ($tmp = mysql_num_fields($res))))
-            printf("[%03d] Expecting boolean/false, got %s/%s\n", $offset + 2, gettype($tmp), $tmp);
-    }
+if ($expected !== ($tmp = mysql_num_fields($res)))
+	printf("[%03d] Expecting %s/%d, got %s/%d\n", $offset + 1,
+	gettype($expected), $expected,
+	gettype($tmp), $tmp);
 
-    func_test_mysql_num_fields($link, "SELECT 1 AS a", 1, 5);
-    func_test_mysql_num_fields($link, "SELECT id, label FROM test", 2, 10);
-    func_test_mysql_num_fields($link, "SELECT 1 AS a, NULL AS b, 'foo' AS c", 3, 15);
-    func_test_mysql_num_fields($link, "SELECT id FROM test", 1, 20, true);
+mysql_free_result($res);
 
-    mysql_close($link);     
-    
-    print "done!";
+if ($test_free && (false !== ($tmp = mysql_num_fields($res))))
+	printf("[%03d] Expecting boolean/false, got %s/%s\n", $offset + 2, gettype($tmp), $tmp);
+}
+
+func_test_mysql_num_fields($link, "SELECT 1 AS a", 1, 5);
+func_test_mysql_num_fields($link, "SELECT id, label FROM test", 2, 10);
+func_test_mysql_num_fields($link, "SELECT 1 AS a, NULL AS b, 'foo' AS c", 3, 15);
+func_test_mysql_num_fields($link, "SELECT id FROM test", 1, 20, true);
+
+mysql_close($link);
+
+print "done!";
 ?>
 --EXPECTF--
 Warning: mysql_num_fields(): %d is not a valid MySQL result resource in %s on line %d