diff --git a/ext/mysql/tests/mysql_create_db.phpt b/ext/mysql/tests/mysql_create_db.phpt
index bf633e3e5e..0a5d30e97a 100644
--- a/ext/mysql/tests/mysql_create_db.phpt
+++ b/ext/mysql/tests/mysql_create_db.phpt
@@ -1,44 +1,44 @@
 --TEST--
 mysql_create_db()
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 if (!function_exists('mysql_create_db'))
-    die("Skip mysql_create_db() exists only in old versions of the libmysql.");
+	die("Skip mysql_create_db() exists only in old versions of the libmysql.");
 ?>
 --FILE--
 <?php
-    include "connect.inc";
+include "connect.inc";
 
-    $link   = NULL;    
-    $tmp    = null;
-    
-    if (false !== ($tmp = mysql_create_db()))
-        printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
-        
-    if (false !== ($tmp = mysql_create_db($link, $link, $link)))
-        printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);        
-    
-    if ($link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket))
-        printf("[003] Can connect to the server using host=%s, user=%s, passwd=***non_empty, dbname=%s, port=%s, socket=%s\n",
-            $host, $user . 'unknown_really', $db, $port, $socket);
-            
-    if (!mysql_query("CREATE DATABASE mysqlcreatedb", $link)) 
-        die(sprintf("[004] Cannot create database, aborting test, [%d] %s\n", mysql_errno($link), mysql_error($link)));
-        
-    if (!mysql_query("DROP DATABASE mysqlcreatedb", $link))
-        printf("[005] [%d] %s\n", mysql_errno($link), mysql_error($link));
+$link   = NULL;
+$tmp    = null;
 
-    if (true !== ($tmp = mysql_create_db("mysqlcreatedb", $link)))
-        printf("[006] Expecting boolean/true, got %s/%s, [%d] %s\n", gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));
-        
-    if (false !== ($tmp = mysql_create_db("mysqlcreatedb", $link)))
-        printf("[007] Expecting boolean/false, got %s/%s, [%d] %s\n", gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));
+if (false !== ($tmp = mysql_create_db()))
+	printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
 
-    if (!mysql_query("DROP DATABASE mysqlcreatedb", $link))
-        printf("[008] [%d] %s\n", mysql_errno($link), mysql_error($link));
+if (false !== ($tmp = mysql_create_db($link, $link, $link)))
+	printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
 
-    print "done!";   
+if ($link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket))
+	printf("[003] Can connect to the server using host=%s, user=%s, passwd=***non_empty, dbname=%s, port=%s, socket=%s\n",
+		$host, $user . 'unknown_really', $db, $port, $socket);
+
+if (!mysql_query("CREATE DATABASE mysqlcreatedb", $link))
+	die(sprintf("[004] Cannot create database, aborting test, [%d] %s\n", mysql_errno($link), mysql_error($link)));
+
+if (!mysql_query("DROP DATABASE mysqlcreatedb", $link))
+	printf("[005] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (true !== ($tmp = mysql_create_db("mysqlcreatedb", $link)))
+	printf("[006] Expecting boolean/true, got %s/%s, [%d] %s\n", gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));
+
+if (false !== ($tmp = mysql_create_db("mysqlcreatedb", $link)))
+	printf("[007] Expecting boolean/false, got %s/%s, [%d] %s\n", gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));
+
+if (!mysql_query("DROP DATABASE mysqlcreatedb", $link))
+	printf("[008] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+print "done!";
 ?>
 --EXPECTF--
 done!
diff --git a/ext/mysql/tests/mysql_data_seek.phpt b/ext/mysql/tests/mysql_data_seek.phpt
index ab83824736..21ebad692b 100644
--- a/ext/mysql/tests/mysql_data_seek.phpt
+++ b/ext/mysql/tests/mysql_data_seek.phpt
@@ -2,63 +2,62 @@
 mysql_data_seek()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
-    include "connect.inc";
+include "connect.inc";
 
-    $tmp    = NULL;   
-    $link   = NULL;
-       
-    if (NULL !== ($tmp = @mysql_data_seek()))
-        printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+$tmp    = NULL;
+$link   = NULL;
 
-    if (NULL !== ($tmp = @mysql_data_seek($link)))
-        printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+if (NULL !== ($tmp = @mysql_data_seek()))
+	printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
 
-    if (false !== ($tmp = @mysql_data_seek($link, $link)))
-        printf("[003] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
-        
-    require('table.inc');    
-    if (!$res = mysql_query('SELECT * FROM test ORDER BY id LIMIT 4', $link)) 
-        printf("[004] [%d] %s\n", mysql_errno($link), mysql_error($link));
-    
-    if (true !== ($tmp = mysql_data_seek($res, 3)))
-        printf("[005] Expecting boolean/true, got %s/%s\n", gettype($tmp), $tmp);
-        
-    $row = mysql_fetch_assoc($res);
-    if (4 != $row['id'])
-        printf("[006] Expecting record 4/d, got record %s/%s\n", $row['id'], $row['label']);
-        
-    if (true !== ($tmp = mysql_data_seek($res, 0)))
-        printf("[007] Expecting boolean/true, got %s/%s\n", gettype($tmp), $tmp);
-    
-    $row = mysql_fetch_assoc($res);
-    if (1 != $row['id'])
-        printf("[008] Expecting record 1/a, got record %s/%s\n", $row['id'], $row['label']);
-        
-    if (false !== ($tmp = mysql_data_seek($res, 4)))
-        printf("[009] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
-        
-    if (false !== ($tmp = mysql_data_seek($res, -1)))
-        printf("[010] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
-        
-    mysql_free_result($res);
-    
-    if (!$res = mysql_unbuffered_query('SELECT * FROM test ORDER BY id', $link)) 
-        printf("[011] [%d] %s\n", mysql_errno($link), mysql_error($link));
-        
-    if (false !== ($tmp = mysql_data_seek($res, 3)))
-        printf("[012] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);    
-        
-    mysql_free_result($res);
-    
-    if (false !== ($tmp = mysql_data_seek($res, 1)))
-        printf("[013] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
-    
-    mysql_close($link);
-        
-    print "done!\n"; 
+if (NULL !== ($tmp = @mysql_data_seek($link)))
+	printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = @mysql_data_seek($link, $link)))
+	printf("[003] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+if (!$res = mysql_query('SELECT * FROM test ORDER BY id LIMIT 4', $link))
+	printf("[004] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (true !== ($tmp = mysql_data_seek($res, 3)))
+	printf("[005] Expecting boolean/true, got %s/%s\n", gettype($tmp), $tmp);
+
+$row = mysql_fetch_assoc($res);
+if (4 != $row['id'])
+	printf("[006] Expecting record 4/d, got record %s/%s\n", $row['id'], $row['label']);
+
+if (true !== ($tmp = mysql_data_seek($res, 0)))
+	printf("[007] Expecting boolean/true, got %s/%s\n", gettype($tmp), $tmp);
+
+$row = mysql_fetch_assoc($res);
+if (1 != $row['id'])
+	printf("[008] Expecting record 1/a, got record %s/%s\n", $row['id'], $row['label']);
+
+if (false !== ($tmp = mysql_data_seek($res, 4)))
+	printf("[009] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = mysql_data_seek($res, -1)))
+	printf("[010] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+mysql_free_result($res);
+
+if (!$res = mysql_unbuffered_query('SELECT * FROM test ORDER BY id', $link))
+	printf("[011] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (false !== ($tmp = mysql_data_seek($res, 3)))
+	printf("[012] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+mysql_free_result($res);
+
+if (false !== ($tmp = mysql_data_seek($res, 1)))
+	printf("[013] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+mysql_close($link);
+
+print "done!\n";
 ?>
 --EXPECTF--
 Warning: mysql_data_seek(): Offset 4 is invalid for MySQL result index %d (or the query data is unbuffered) in %s on line %d