7 files changed, 4 insertions, 24 deletions
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt b/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt
index b177c1fd5b..67c4442d28 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt
@@ -2,8 +2,6 @@
 mysqli_real_escape_string() - big5
 --SKIPIF--
 <?php
-if (ini_get('unicode.semantics'))
-	die("skip Test cannot be run in unicode mode");
 
 require_once('skipif.inc');
 require_once('skipifemb.inc');
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt b/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt
index cf4afb6f6b..208056fc47 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt
@@ -2,8 +2,6 @@
 mysqli_real_escape_string() - eucjpms
 --SKIPIF--
 <?php
-if (ini_get('unicode.semantics'))
-	die("skip Test cannot be run in unicode mode");
 
 require_once('skipif.inc');
 require_once('skipifemb.inc');
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt b/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt
index 7ac7497b80..7fa5523661 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt
@@ -2,8 +2,6 @@
 mysqli_real_escape_string() - euckr
 --SKIPIF--
 <?php
-if (ini_get('unicode.semantics'))
-	die("skip Test cannot be run in unicode mode");
 
 require_once('skipif.inc');
 require_once('skipifemb.inc');
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt b/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt
index b93d8154fa..0f7a5083b8 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt
@@ -2,8 +2,6 @@
 mysqli_real_escape_string() - gb2312
 --SKIPIF--
 <?php
-if (ini_get('unicode.semantics'))
-	die("skip Test cannot be run in unicode mode");
 
 require_once('skipif.inc');
 require_once('skipifemb.inc');
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_connection_status.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_connection_status.phpt
index 187f9ec232..7db5ec35ec 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_connection_status.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_connection_status.phpt
@@ -13,13 +13,8 @@ $db = MySQLPDOTest::factory();
 	$db = MySQLPDOTest::factory();
 
 	$status = $db->getAttribute(PDO::ATTR_CONNECTION_STATUS);
-	if (ini_get('unicode.semantics')) {
-		if (!is_unicode($status))
-			printf("[001] Expecting unicode, got '%s'\n", var_export($status, true));
-	} else {
-		if (!is_string($status))
-			printf("[002] Expecting string, got '%s'\n", var_export($status, true));
-	}
+    if (!is_string($status))
+        printf("[002] Expecting string, got '%s'\n", var_export($status, true));
 
 	if ('' == $status)
 		printf("[003] Connection status string must not be empty\n");
@@ -34,4 +29,4 @@ $db = MySQLPDOTest::factory();
 	print "done!";
 ?>
 --EXPECTF--
-done!
-\ No newline at end of file
+done!
diff --git a/ext/session/tests/025.phpt b/ext/session/tests/025.phpt
index 83ab6ca370..aa1f995c49 100644
--- a/ext/session/tests/025.phpt
+++ b/ext/session/tests/025.phpt
@@ -46,13 +46,6 @@ class handler {
     }
 
     function gc() { return true; }
-
-    function __construct()
-    {
-        if (ini_get("unicode.semantics")) {
-            $this->data = str_replace('s:', 'U:', $this->data);
-        }
-    }
 }
 
 $hnd = new handler;
diff --git a/ext/simplexml/tests/000.phpt b/ext/simplexml/tests/000.phpt
index ae23dcfdd0..62615d17a2 100644
--- a/ext/simplexml/tests/000.phpt
+++ b/ext/simplexml/tests/000.phpt
@@ -22,7 +22,7 @@ test('sxe->elem1');
 test('sxe->elem1[0]');
 test('sxe->elem1[0]->elem2');
 test('sxe->elem1[0]->elem2->bla');
-if (!ini_get("unicode_semantics")) test('sxe->elem1[0]["attr1"]');
+test('sxe->elem1[0]["attr1"]');
 test('sxe->elem1[0]->attr1');
 test('sxe->elem1[1]');
 test('sxe->elem1[2]');