4 files changed, 7 insertions, 1 deletions
diff --git a/ext/mbstring/tests/bug28220.phpt b/ext/mbstring/tests/bug28220.phpt
index 563e2da74..f195606a1 100644
--- a/ext/mbstring/tests/bug28220.phpt
+++ b/ext/mbstring/tests/bug28220.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #28220 (mb_strwidth() returns wrong width values for some Hangul characters)
+--SKIPIF--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
 <?php
 $coderange = array(
diff --git a/ext/mbstring/tests/bug30549.phpt b/ext/mbstring/tests/bug30549.phpt
index dbd8e0bd1..a6007e0b3 100644
--- a/ext/mbstring/tests/bug30549.phpt
+++ b/ext/mbstring/tests/bug30549.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #30549 (incorrect character translations for some ISO8859 charsets)
+--SKIPIF--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
 <?php
 test('ISO-8859-7',  array(0xa4 => 0x20ac, 0xa5 => 0x20af, 0xaa => 0x037a));
diff --git a/ext/mbstring/tests/bug31911.phpt b/ext/mbstring/tests/bug31911.phpt
index eb6438d4e..48d497175 100644
--- a/ext/mbstring/tests/bug31911.phpt
+++ b/ext/mbstring/tests/bug31911.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #31911 (mb_decode_mimeheader() is case-sensitive to hex escapes)
+--SKIPIF--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
 <?php
 echo mb_decode_mimeheader("Works: =?iso-8859-1?q?=3F=3F=3F?=");
diff --git a/ext/mbstring/tests/mb_strcut.phpt b/ext/mbstring/tests/mb_strcut.phpt
index 8ea074a3c..6a90d87d2 100644
--- a/ext/mbstring/tests/mb_strcut.phpt
+++ b/ext/mbstring/tests/mb_strcut.phpt
@@ -17,7 +17,7 @@ print  mb_strcut($euc_jp,  6,   5,'EUC-JP') . "\n";
 print  mb_strcut($euc_jp,  0, 100,'EUC-JP') . "\n";
 
 $str = mb_strcut($euc_jp, 100, 10,'EUC-JP');
-($str === "") ? print "OK\n" : print "NG: $str\n";
+($str === false) ? print "OK\n" : print "NG: $str\n";
 
 $str = mb_strcut($euc_jp, -100, 10,'EUC-JP');
 ($str !== "") ?	print "OK: $str\n" : print "NG:\n";