4 files changed, 12 insertions, 4 deletions
diff --git a/tests/func/005a.phpt b/tests/func/005a.phpt
index f7843e10a..3c2bcb166 100644
--- a/tests/func/005a.phpt
+++ b/tests/func/005a.phpt
@@ -1,5 +1,9 @@
 --TEST--
 Testing register_shutdown_function() with timeout. (Bug: #21513)
+--SKIPIF--
+<?php
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
+?>
 --FILE--
 <?php
 
diff --git a/tests/func/010.phpt b/tests/func/010.phpt
index 6778ed2f1..f970283dc 100644
--- a/tests/func/010.phpt
+++ b/tests/func/010.phpt
@@ -1,5 +1,9 @@
 --TEST--
 function with many parameters
+--SKIPIF--
+<?php
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
+?>
 --FILE--
 <?php
 
diff --git a/tests/lang/034.phpt b/tests/lang/034.phpt
index e442db8ff..dcb5436e2 100644
--- a/tests/lang/034.phpt
+++ b/tests/lang/034.phpt
@@ -4,14 +4,14 @@ Bug #12647 (Locale settings affecting float parsing)
 precision=14
 --SKIPIF--
 <?php  # try to activate a german locale
-if (setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge", "de_DE.ISO8859-1") === FALSE) {
+if (setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.ISO-8859-1") === FALSE) {
 	print "skip";
 }
 ?>
 --FILE--
 <?php 
 # activate the german locale
-setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge", "de_DE.ISO8859-1");
+setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.ISO-8859-1");
 
 echo (float)"3.14", "\n";
 ?>
diff --git a/tests/lang/bug30638.phpt b/tests/lang/bug30638.phpt
index 101ce934e..30b70f30f 100644
--- a/tests/lang/bug30638.phpt
+++ b/tests/lang/bug30638.phpt
@@ -2,7 +2,7 @@
 Bug #30638 (localeconv returns wrong LC_NUMERIC settings) (ok to fail on MacOS X)
 --SKIPIF--
 <?php  # try to activate a german locale
-if (setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge") === FALSE) {
+if (setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.ISO-8859-1") === FALSE) {
 	print "skip setlocale() failed";
 } elseif (strtolower(php_uname('s')) == 'darwin') {
     print "skip ok to fail on MacOS X";
@@ -11,7 +11,7 @@ if (setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge") === FALSE) {
 --FILE--
 <?php 
 # activate the german locale
-setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge");
+setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.ISO-8859-1");
 
 $lc = localeconv();
 printf("decimal_point: %s\n", $lc['decimal_point']);