diff --git a/tests/001.phpt b/tests/001.phpt
index 41cec0ae7..6a97fbdad 100644
--- a/tests/001.phpt
+++ b/tests/001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Check for xdebug presence
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.profiler_enable=0
 --FILE--
diff --git a/tests/array_map.phpt b/tests/array_map.phpt
index e3d4d0e02..45a3f1f04 100644
--- a/tests/array_map.phpt
+++ b/tests/array_map.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test with internal callbacks
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/assert_test.phpt b/tests/assert_test.phpt
index afb05c460..fd6e78efc 100644
--- a/tests/assert_test.phpt
+++ b/tests/assert_test.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test for assertion callbacks
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/assignment-trace8-php52.phpt b/tests/assignment-trace8-php52.phpt
index 760de0d8b..b17977269 100644
--- a/tests/assignment-trace8-php52.phpt
+++ b/tests/assignment-trace8-php52.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test for tracing multi-dimensional property assignments in user-readable function traces (< PHP 5.3)
 --SKIPIF--
-<?php if(version_compare(phpversion(), "5.3.0", '>=')) echo "skip < PHP 5.3 needed\n"; ?>
+<?php if (!version_compare(phpversion(), "5.3", '<')) echo "skip < PHP 5.3 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0
diff --git a/tests/assignment-trace8.phpt b/tests/assignment-trace8.phpt
index 7f1badc24..f4c5b3bfe 100644
--- a/tests/assignment-trace8.phpt
+++ b/tests/assignment-trace8.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test for tracing multi-dimensional property assignments in user-readable function traces (>= PHP 5.3)
 --SKIPIF--
-<?php if(version_compare(phpversion(), "5.3.0", '<')) echo "skip PHP 5.3 needed\n"; ?>
+<?php if (!version_compare(phpversion(), "5.3", '>=')) echo "skip >= PHP 5.3 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0
diff --git a/tests/assignment-trace9-php52.phpt b/tests/assignment-trace9-php52.phpt
index b165a1212..0396b8e1d 100644
--- a/tests/assignment-trace9-php52.phpt
+++ b/tests/assignment-trace9-php52.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test for tracing mixed array element and property assignments in user-readable function traces (< PHP 5.3)
 --SKIPIF--
-<?php if(version_compare(phpversion(), "5.3.0", '>=')) echo "skip < PHP 5.3 needed\n"; ?>
+<?php if (!version_compare(phpversion(), "5.3", '<')) echo "skip < PHP 5.3 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0
diff --git a/tests/assignment-trace9.phpt b/tests/assignment-trace9.phpt
index 86c09a9d3..368de9bb0 100644
--- a/tests/assignment-trace9.phpt
+++ b/tests/assignment-trace9.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test for tracing mixed array element and property assignments in user-readable function traces (>= PHP 5.3)
 --SKIPIF--
-<?php if(version_compare(phpversion(), "5.3.0", '<')) echo "skip PHP 5.3 needed\n"; ?>
+<?php if (!version_compare(phpversion(), "5.3", '>=')) echo "skip >= PHP 5.3 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0
diff --git a/tests/auto_trace.phpt b/tests/auto_trace.phpt
index fb015c7db..fe6126033 100644
--- a/tests/auto_trace.phpt
+++ b/tests/auto_trace.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test with auto-trace
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=1
diff --git a/tests/bug00001.phpt b/tests/bug00001.phpt
index 90a9f9f27..d3c931420 100644
--- a/tests/bug00001.phpt
+++ b/tests/bug00001.phpt
@@ -1,8 +1,5 @@
 --TEST--
 Test for crash with a destructor
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/bug00002.phpt b/tests/bug00002.phpt
index ad98535ca..350443afc 100644
--- a/tests/bug00002.phpt
+++ b/tests/bug00002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test for traces to file
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/bug00003.phpt b/tests/bug00003.phpt
index 67627afec..7288476dc 100644
--- a/tests/bug00003.phpt
+++ b/tests/bug00003.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Text for crash bug in tracing to file
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/bug00022.phpt b/tests/bug00022.phpt
index 1bac841df..869db5ff6 100644
--- a/tests/bug00022.phpt
+++ b/tests/bug00022.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test for segmentation fault with xdebug_get_function_stack() and collect_params=1. (ZE20)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2.0 needed\n"; ?>
+Test for segmentation fault with xdebug_get_function_stack() and collect_params=1
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/bug00032-php52.phpt b/tests/bug00032-php52.phpt
new file mode 100644
index 000000000..5b81824bc
--- /dev/null
+++ b/tests/bug00032-php52.phpt
@@ -0,0 +1,47 @@
+--TEST--
+Test for segmentation fault with unusual variables (>= PHP 5.2)
+--SKIPIF--
+<?php if (!version_compare(phpversion(), "5.2", '>=')) echo "skip >= PHP 5.2 needed\n"; ?>
+--INI--
+xdebug.default_enable=1
+xdebug.auto_trace=0
+xdebug.collect_params=1
+xdebug.collect_assignments=0
+xdebug.profiler_enable=0
+xdebug.show_local_vars=0
+xdebug.dump_globals=0
+--FILE--
+<?php
+	${1} = "foo";
+	echo ${1} . "\n";
+
+	${STDIN} = "foo";
+	echo ${STDIN} . "\n";
+
+	${array(1,2,3)} = "foo";
+	echo ${array(1,2,3)} . "\n";
+
+	${new stdclass} = "foo";
+	echo ${new stdclass} . "\n";
+?>
+--EXPECTF--
+foo
+foo
+
+Notice: Array to string conversion in %sbug00032-php52.php on line 8
+
+Call Stack:
+%w%f %w%d   1. {main}() %sbug00032-php52.php:0
+
+
+Notice: Array to string conversion in %sbug00032-php52.php on line 9
+
+Call Stack:
+%w%f %w%d   1. {main}() %sbug00032-php52.php:0
+
+foo
+
+Catchable fatal error: Object of class stdClass could not be converted to string in %sbug00032-php52.php on line 11
+
+Call Stack:
+%w%f %w%d   1. {main}() %sbug00032-php52.php:0
diff --git a/tests/bug00032-ze22.phpt b/tests/bug00032-ze22.phpt
deleted file mode 100644
index 6eba1abdd..000000000
--- a/tests/bug00032-ze22.phpt
+++ /dev/null
@@ -1,48 +0,0 @@
---TEST--
-Test for segmentation fault with unusual variables (ZE2.2)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.2.0-dev", '<')) echo "skip Zend Engine 2.2 needed\n"; ?>
---INI--
-xdebug.default_enable=1
-xdebug.auto_trace=0
-xdebug.collect_params=1
-xdebug.collect_assignments=0
-xdebug.profiler_enable=0
-xdebug.show_local_vars=0
-xdebug.dump_globals=0
---FILE--
-<?php
-	${1} = "foo";
-	echo ${1} . "\n";
-
-	${STDIN} = "foo";
-	echo ${STDIN} . "\n";
-
-	${array(1,2,3)} = "foo";
-	echo ${array(1,2,3)} . "\n";
-
-	${new stdclass} = "foo";
-	echo ${new stdclass} . "\n";
-?>
---EXPECTF--
-foo
-foo
-
-Notice: Array to string conversion in %sbug00032-ze22.php on line 8
-
-Call Stack:
-%w%f %w%d   1. {main}() %sbug00032-ze22.php:0
-
-
-Notice: Array to string conversion in %sbug00032-ze22.php on line 9
-
-Call Stack:
-%w%f %w%d   1. {main}() %sbug00032-ze22.php:0
-
-foo
-
-Catchable fatal error: Object of class stdClass could not be converted to string in %sbug00032-ze22.php on line 11
-
-Call Stack:
-%w%f %w%d   1. {main}() %sbug00032-ze22.php:0
diff --git a/tests/bug00032.phpt b/tests/bug00032.phpt
index 3cbc132ba..98729e323 100644
--- a/tests/bug00032.phpt
+++ b/tests/bug00032.phpt
@@ -1,9 +1,7 @@
 --TEST--
-Test for segmentation fault with unusual variables (ZE2)
+Test for segmentation fault with unusual variables (< PHP 5.2)
 --SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2.0/2.1 needed\n"; ?>
-<?php if(version_compare(zend_version(), "2.2.0-dev", '>')) echo "skip Zend Engine 2.2 needed\n"; ?>
+<?php if (!version_compare(phpversion(), "5.2", '<')) echo "skip < PHP 5.2 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
@@ -34,10 +32,12 @@ Notice: Array to string conversion in %sbug00032.php on line 8
 Call Stack:
 %w%f %w%d   1. {main}() %sbug00032.php:0
 
+
 Notice: Array to string conversion in %sbug00032.php on line 9
 
 Call Stack:
 %w%f %w%d   1. {main}() %sbug00032.php:0
+
 foo
 
 Notice: Object of class stdClass to string conversion in %sbug00032.php on line 11
@@ -45,8 +45,10 @@ Notice: Object of class stdClass to string conversion in %sbug00032.php on line
 Call Stack:
 %w%f %w%d   1. {main}() %sbug00032.php:0
 
+
 Notice: Object of class stdClass to string conversion in %sbug00032.php on line 12
 
 Call Stack:
 %w%f %w%d   1. {main}() %sbug00032.php:0
+
 foo
diff --git a/tests/bug00057-ze2.phpt b/tests/bug00057.phpt
similarity index 66%
rename from tests/bug00057-ze2.phpt
rename to tests/bug00057.phpt
index e0a26762e..36185d078 100644
--- a/tests/bug00057-ze2.phpt
+++ b/tests/bug00057.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test for bug #57: Crash with overloading functions (ZE2)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
+Test for bug #57: Crash with overloading functions
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/bug00089.phpt b/tests/bug00089.phpt
index 72c3a396c..bd88a5262 100644
--- a/tests/bug00089.phpt
+++ b/tests/bug00089.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test for bug #89: var_dump shows empty strings garbled
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/bug00146.phpt b/tests/bug00146.phpt
index 2548b0eb3..6c1e7d09b 100644
--- a/tests/bug00146.phpt
+++ b/tests/bug00146.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test for bug #146: Array key names with quotes in traces are not escaped
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/bug00168.phpt b/tests/bug00168.phpt
index 2bdd90694..65e0e2814 100644
--- a/tests/bug00168.phpt
+++ b/tests/bug00168.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #168: Memory error with DBGp eval when the result is an array.
+Test for bug #168: Memory error with DBGp eval when the result is an array
 --SKIPIF--
 <?php print "skip Can only be tested through DBGp"; ?>
 --FILE--
diff --git a/tests/bug00173.phpt b/tests/bug00173.phpt
index 2906a6952..164e193c5 100644
--- a/tests/bug00173.phpt
+++ b/tests/bug00173.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test for bug #173: Xdebug segfaults using SPL ArrayIterator.
+Test for bug #173: Xdebug segfaults using SPL ArrayIterator (>= PHP 5.2)
 --SKIPIF--
 <?php if (!extension_loaded("xdebug")) print "skip"; ?>
 <?php if (!extension_loaded("SPL")) print "skip No SPL available"; ?>
-<?php if(version_compare(zend_version(), "2.2.0-dev", '<')) echo "skip Zend Engine 2.2 needed\n"; ?>
+<?php if (!version_compare(phpversion(), "5.2", '>=')) echo "skip >= PHP 5.2 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=1
diff --git a/tests/bug00176.phpt b/tests/bug00176.phpt
index a4f4d768e..cabb26190 100644
--- a/tests/bug00176.phpt
+++ b/tests/bug00176.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test for bug #176: Segfault using SplTempFileObject
+Test for bug #176: Segfault using SplTempFileObject (>= PHP 5.2)
 --SKIPIF--
 <?php if (!extension_loaded("xdebug")) print "skip"; ?>
 <?php if (!extension_loaded("SPL")) print "skip No SPL available"; ?>
-<?php if(version_compare(zend_version(), "2.2.0-dev", '<')) echo "skip Zend Engine 2.2 needed\n"; ?>
+<?php if (!version_compare(phpversion(), "5.2", '>=')) echo "skip >= PHP 5.2 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/bug00209.phpt b/tests/bug00209.phpt
index 400bc5b51..47e9ba8a6 100644
--- a/tests/bug00209.phpt
+++ b/tests/bug00209.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #209: Additional remote debugging session started when triggering shutdown function.
+Test for bug #209: Additional remote debugging session started when triggering shutdown function
 --SKIPIF--
 <?php print "skip Can only be tested through DBGp"; ?>
 --FILE--
diff --git a/tests/bug00212a.phpt b/tests/bug00212a.phpt
index 7220435dd..d97bd1720 100644
--- a/tests/bug00212a.phpt
+++ b/tests/bug00212a.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test for bug #212: coverage coverage inaccurate (ZE2).
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
+Test for bug #212: coverage coverage inaccurate (1)
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/bug00212b.phpt b/tests/bug00212b.phpt
index 13c04f54b..9419b6421 100644
--- a/tests/bug00212b.phpt
+++ b/tests/bug00212b.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test for bug #212: coverage coverage inaccurate.
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
+Test for bug #212: coverage coverage inaccurate (2)
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/bug00212c.phpt b/tests/bug00212c.phpt
index 7275c1a0a..18107a9c2 100644
--- a/tests/bug00212c.phpt
+++ b/tests/bug00212c.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test for bug #212: coverage coverage inaccurate.
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
+Test for bug #212: coverage coverage inaccurate (3)
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/bug00213.phpt b/tests/bug00213.phpt
index 81bf9bfdb..92ca17201 100644
--- a/tests/bug00213.phpt
+++ b/tests/bug00213.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test for bug #213: Dead code analysis doesn't take catches for throws into account.
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
+Test for bug #213: Dead code analysis doesn't take catches for throws into account
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/bug00241.phpt b/tests/bug00241.phpt
index 9bb4c9f42..883a07906 100644
--- a/tests/bug00241.phpt
+++ b/tests/bug00241.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test for bug #241: Crash in xdebug_get_function_stack().
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
+Test for bug #241: Crash in xdebug_get_function_stack()
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/bug00265.phpt b/tests/bug00265.phpt
index c7796778b..e343b8312 100644
--- a/tests/bug00265.phpt
+++ b/tests/bug00265.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test for bug #265: Xdebug's error handler breaks error_get_last().
---SKIPIF--
-<?php if(version_compare(phpversion(), "5.2.0", '<')) echo "skip PHP 5.2 or higher needed\n"; ?>
+Test for bug #265: Xdebug's error handler breaks error_get_last()
 --INI--
 xdebug.default_enable=1
 xdebug.dump_globals=0
diff --git a/tests/bug00280.phpt b/tests/bug00280.phpt
index ac1f03ab1..c7930d356 100644
--- a/tests/bug00280.phpt
+++ b/tests/bug00280.phpt
@@ -1,8 +1,5 @@
 --TEST--
 Test for bug #280: var_dump don't display key of array as expected
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
 --INI--
 xdebug.overload_var_dump=1
 --FILE--
diff --git a/tests/bug00298.phpt b/tests/bug00298.phpt
index d76f58e16..6260e26b2 100644
--- a/tests/bug00298.phpt
+++ b/tests/bug00298.phpt
@@ -1,9 +1,5 @@
 --TEST--
-Test for bug #298: xdebug_var_dump & multiline strings,
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
---INI--
+Test for bug #298: xdebug_var_dump & multiline strings
 --FILE--
 <?php
 ini_set('html_errors', '1');
diff --git a/tests/bug00313.phpt b/tests/bug00313.phpt
index 1443ddd7e..dc339b23b 100644
--- a/tests/bug00313.phpt
+++ b/tests/bug00313.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test for bug #313: Segmentation Fault in code coverage analysis on empty PHP files.
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
+Test for bug #313: Segmentation Fault in code coverage analysis on empty PHP files
 --INI--
 xdebug.default_enable=1
 xdebug.dump_globals=0
diff --git a/tests/bug00314.phpt b/tests/bug00314.phpt
index fc87810e4..b46e20383 100644
--- a/tests/bug00314.phpt
+++ b/tests/bug00314.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test for bug #314: PHP CLI Error Logging thwarted when XDebug Loaded.
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
+Test for bug #314: PHP CLI Error logging thwarted when Xdebug loaded
 --INI--
 xdebug.default_enable=1
 xdebug.dump_globals=0
diff --git a/tests/bug00315.phpt b/tests/bug00315.phpt
index 9b30e3273..21bf6aa67 100644
--- a/tests/bug00315.phpt
+++ b/tests/bug00315.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test for bug #315: Xdebug crashes when including a file that doesn't exist.
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
+Test for bug #315: Xdebug crashes when including a file that doesn't exist
 --INI--
 xdebug.default_enable=1
 xdebug.dump_globals=0
diff --git a/tests/bug00318.phpt b/tests/bug00318.phpt
index 01fe21d7e..06eccff21 100644
--- a/tests/bug00318.phpt
+++ b/tests/bug00318.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test for bug #318: Segmentation Fault in code coverage analysis
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.dump_globals=0
diff --git a/tests/bug00328.phpt b/tests/bug00328.phpt
index d1b376856..91800a8c0 100644
--- a/tests/bug00328.phpt
+++ b/tests/bug00328.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #328: (Private properties are incorrectly enumerated in case of extended classes)
+Test for bug #328: Private properties are incorrectly enumerated in case of extended classes
 --INI--
 html_errors=1
 --FILE--
diff --git a/tests/bug00334.phpt b/tests/bug00334.phpt
index 330b16863..58e33936e 100644
--- a/tests/bug00334.phpt
+++ b/tests/bug00334.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test for bug #334: Code Coverage Regressions
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.dump_globals=0
diff --git a/tests/bug00355.phpt b/tests/bug00355.phpt
index 58c02c23e..7f3dd39f7 100644
--- a/tests/bug00355.phpt
+++ b/tests/bug00355.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test for bug #355: Non-unique functions numbers in function traces.
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
+Test for bug #355: Non-unique functions numbers in function traces
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0
diff --git a/tests/bug00391.phpt b/tests/bug00391.phpt
index 24f2ebfc2..78b1aff28 100644
--- a/tests/bug00391.phpt
+++ b/tests/bug00391.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #391: When PHP runs with Xdebug it doesn't stop executing script when type hinting leads to fatal error.
+Test for bug #391: When PHP runs with Xdebug it doesn't stop executing script when type hinting leads to fatal error
 --INI--
 log_errors=0
 xdebug.default_enable=1
diff --git a/tests/bug00419-sunos.phpt b/tests/bug00419-sunos.phpt
index 6f0cc5fbf..d2c11f6d5 100644
--- a/tests/bug00419-sunos.phpt
+++ b/tests/bug00419-sunos.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test for bug #419: make use of P_tmpdir if defined instead of hardcoded '/tmp'.
+Test for bug #419: make use of P_tmpdir if defined instead of hardcoded '/tmp'
 --SKIPIF--
-<?php if (php_uname('s') != 'SunOS') echo "skip This variant is for Solaris/OpenSolaris/OpenIndiana\n"; ?>
+<?php if (php_uname('s') != 'SunOS') echo "skip Solaris/OpenSolaris/OpenIndiana needed\n"; ?>
 --FILE--
 <?php
 echo ini_get( 'xdebug.trace_output_dir' ), "\n";
diff --git a/tests/bug00419.phpt b/tests/bug00419.phpt
index 6c1817a81..30dccfde5 100644
--- a/tests/bug00419.phpt
+++ b/tests/bug00419.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test for bug #419: make use of P_tmpdir if defined instead of hardcoded '/tmp'.
+Test for bug #419: make use of P_tmpdir if defined instead of hardcoded '/tmp'
 --SKIPIF--
-<?php if (php_uname('s') != 'Linux') echo "skip This variant is for Linux\n"; ?>
+<?php if (php_uname('s') != 'Linux') echo "skip Linux needed\n"; ?>
 --FILE--
 <?php
 echo ini_get( 'xdebug.trace_output_dir' ), "\n";
diff --git a/tests/bug00421.phpt b/tests/bug00421.phpt
index 5391f6baf..4165e0e74 100644
--- a/tests/bug00421.phpt
+++ b/tests/bug00421.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #421: xdebug sends back invalid characters in xml sometimes.
+Test for bug #421: xdebug sends back invalid characters in xml sometimes
 --FILE--
 <?php
 require 'dbgp/dbgpclient.php';
diff --git a/tests/bug00422.phpt b/tests/bug00422.phpt
index bee495caf..14cb7344a 100644
--- a/tests/bug00422.phpt
+++ b/tests/bug00422.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test for bug #422: Segfaults when using code coverage with a parse error in the script.
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
+Test for bug #422: Segfaults when using code coverage with a parse error in the script
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/bug00470.phpt b/tests/bug00470.phpt
index 1d49fcb8b..0663ed477 100644
--- a/tests/bug00470.phpt
+++ b/tests/bug00470.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test for bug #470: catch blocks marked as dead code unless executed.
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
+Test for bug #470: catch blocks marked as dead code unless executed
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/bug00472.phpt b/tests/bug00472.phpt
index b877bba10..cfdd9e1df 100644
--- a/tests/bug00472.phpt
+++ b/tests/bug00472.phpt
@@ -1,8 +1,7 @@
 --TEST--
-Test for bug #472: Dead Code Analysis for code coverage messed up after goto.
+Test for bug #472: Dead Code Analysis for code coverage messed up after goto
 --SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(phpversion(), "5.3.0", '<')) echo "skip PHP 5.3 needed\n"; ?>
+<?php if (!version_compare(phpversion(), "5.3", '>=')) echo "skip >= PHP 5.3 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/bug00475.phpt b/tests/bug00475.phpt
index 7b328e882..2d57f6ea7 100644
--- a/tests/bug00475.phpt
+++ b/tests/bug00475.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #475: Property names with null chars are not sent fully to the client.
+Test for bug #475: Property names with null chars are not sent fully to the client
 --FILE--
 <?php
 require 'dbgp/dbgpclient.php';
diff --git a/tests/bug00476-2.phpt b/tests/bug00476-2.phpt
index f31d3b990..558ab0a35 100644
--- a/tests/bug00476-2.phpt
+++ b/tests/bug00476-2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test for bug #476: Exception chanining doesn't work
 --SKIPIF--
-<?php if(version_compare(phpversion(), "5.3.0", '<')) echo "skip PHP 5.3 needed\n"; ?>
+<?php if (!version_compare(phpversion(), "5.3", '>=')) echo "skip >= PHP 5.3 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.dump.GET=
diff --git a/tests/bug00476.phpt b/tests/bug00476.phpt
index 47a02a03e..a36bc02dc 100644
--- a/tests/bug00476.phpt
+++ b/tests/bug00476.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test for bug #476: Exception chanining doesn't work
 --SKIPIF--
-<?php if(version_compare(phpversion(), "5.3.0", '<')) echo "skip PHP 5.3 needed\n"; ?>
+<?php if (!version_compare(phpversion(), "5.3", '>=')) echo "skip >= PHP 5.3 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.dump.GET=
diff --git a/tests/bug00494.phpt b/tests/bug00494.phpt
index f925b6521..74e64123b 100644
--- a/tests/bug00494.phpt
+++ b/tests/bug00494.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #494: Private attributes of parent class unavailable when inheriting.
+Test for bug #494: Private attributes of parent class unavailable when inheriting
 --FILE--
 <?php
 require 'dbgp/dbgpclient.php';
diff --git a/tests/bug00501.phpt b/tests/bug00501.phpt
index 960daebc9..ce18a5bb1 100644
--- a/tests/bug00501.phpt
+++ b/tests/bug00501.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #501: Xdebug's variable tracing misses POST_INC and variants.
+Test for bug #501: Xdebug's variable tracing misses POST_INC and variants
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0
diff --git a/tests/bug00515.phpt b/tests/bug00515.phpt
index ff0d6522c..3d5430f4a 100644
--- a/tests/bug00515.phpt
+++ b/tests/bug00515.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test for bug #515: Dead Code Analysis for code coverage messed up with ticks.
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
+Test for bug #515: Dead Code Analysis for code coverage messed up with ticks
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/bug00530.phpt b/tests/bug00530.phpt
index 12dac1ce0..493637c02 100644
--- a/tests/bug00530.phpt
+++ b/tests/bug00530.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test for bug #530: Xdebug returns properties out of page if there are less than max_children properties.
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
+Test for bug #530: Xdebug returns properties out of page if there are less than max_children properties
 --FILE--
 <?php
 require 'dbgp/dbgpclient.php';
diff --git a/tests/bug00535.phpt b/tests/bug00535.phpt
index 351f440cb..00c9b8ec8 100644
--- a/tests/bug00535.phpt
+++ b/tests/bug00535.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #535: Code coverage and return before function|class ending.
+Test for bug #535: Code coverage and return before function|class ending
 --FILE--
 <?php
 xdebug_start_code_coverage();
diff --git a/tests/bug00538-2.phpt b/tests/bug00538-2.phpt
index bc73e4276..4f22f3af1 100644
--- a/tests/bug00538-2.phpt
+++ b/tests/bug00538-2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #538: Error in watches and call stack parameter with string containing '\\'.
+Test for bug #538: Error in watches and call stack parameter with string containing '\\'
 --INI--
 xdebug.collect_params=3
 --FILE--
diff --git a/tests/bug00562.phpt b/tests/bug00562.phpt
index 1cc4a9edb..0722d2ca5 100644
--- a/tests/bug00562.phpt
+++ b/tests/bug00562.phpt
@@ -1,8 +1,7 @@
 --TEST--
 Test for bug #562: Incorrect coverage information for closure function headers
 --SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(phpversion(), "5.3.0", '<')) echo "skip PHP 5.3 needed\n"; ?>
+<?php if (!version_compare(phpversion(), "5.3", '>=')) echo "skip >= PHP 5.3 needed\n"; ?>
 --FILE--
 <?php
 
diff --git a/tests/bug00565.phpt b/tests/bug00565.phpt
index f2216fb1b..69bbfebea 100644
--- a/tests/bug00565.phpt
+++ b/tests/bug00565.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #565: xdebug.show_local_vars setting does not work with php 5.3.
+Test for bug #565: xdebug.show_local_vars setting does not work with php 5.3
 --INI--
 xdebug.default_enable=1
 xdebug.collect_params=1
diff --git a/tests/bug00566-1.phpt b/tests/bug00566-1.phpt
index e3f1df6a4..a10272e03 100644
--- a/tests/bug00566-1.phpt
+++ b/tests/bug00566-1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #566: Xdebug crashes when using conditional breakpoints [1]
+Test for bug #566: Xdebug crashes when using conditional breakpoints (1)
 --INI--
 xdebug.collect_params=4
 xdebug.collect_return=1
diff --git a/tests/bug00566-2.phpt b/tests/bug00566-2.phpt
index 36c94297d..8587f1324 100644
--- a/tests/bug00566-2.phpt
+++ b/tests/bug00566-2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #566: Xdebug crashes when using conditional breakpoints [2]
+Test for bug #566: Xdebug crashes when using conditional breakpoints (2)
 --INI--
 xdebug.collect_params=4
 xdebug.collect_return=1
diff --git a/tests/bug00567.phpt b/tests/bug00567.phpt
index 90b0a82f3..de469a50e 100644
--- a/tests/bug00567.phpt
+++ b/tests/bug00567.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #567: xdebug_debug_zval() and xdebug_debug_zval_stdout() don't work with php 5.3.
+Test for bug #567: xdebug_debug_zval() and xdebug_debug_zval_stdout() don't work with php 5.3
 --INI--
 xdebug.default_enable=1
 --FILE--
diff --git a/tests/bug00606-2.phpt b/tests/bug00606-2.phpt
index d8d5aff92..2770d2191 100644
--- a/tests/bug00606-2.phpt
+++ b/tests/bug00606-2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #606: evaluate a $this->... expression when $this is not accesible crash xdebug.
+Test for bug #606: evaluate a $this->... expression when $this is not accesible crash xdebug
 --FILE--
 <?php
 require 'dbgp/dbgpclient.php';
diff --git a/tests/bug00606.phpt b/tests/bug00606.phpt
index dac4bced4..be99a8f57 100644
--- a/tests/bug00606.phpt
+++ b/tests/bug00606.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #606: evaluate a $this->... expression when $this is not accesible crash xdebug.
+Test for bug #606: evaluate a $this->... expression when $this is not accesible crash xdebug
 --FILE--
 <?php
 require 'dbgp/dbgpclient.php';
diff --git a/tests/bug00614.phpt b/tests/bug00614.phpt
index 8bc7f9689..26e75dd79 100644
--- a/tests/bug00614.phpt
+++ b/tests/bug00614.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #614: local variables loses class members. (PHP < 5.4)
+Test for bug #614: local variables loses class members (PHP < 5.4)
 --SKIPIF--
 <?php if (!version_compare(phpversion(), "5.4", '<')) echo "skip < PHP 5.4 needed\n"; ?>
 --FILE--
diff --git a/tests/bug00622-php53.phpt b/tests/bug00622-php53.phpt
index 529525532..a66fdb667 100644
--- a/tests/bug00622-php53.phpt
+++ b/tests/bug00622-php53.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test for bug #622: Working with eval() code is inconvenient and difficult.
+Test for bug #622: Working with eval() code is inconvenient and difficult (>= PHP 5.3)
 --SKIPIF--
-<?php if (version_compare(phpversion(), "5.3.0", '<')) echo "skip >= PHP 5.3 needed\n"; ?>
+<?php if (!version_compare(phpversion(), "5.3", '>=')) echo "skip >= PHP 5.3 needed\n"; ?>
 --FILE--
 <?php
 require 'dbgp/dbgpclient.php';
diff --git a/tests/bug00622.phpt b/tests/bug00622.phpt
index 6c3ae8932..f5b0b3027 100644
--- a/tests/bug00622.phpt
+++ b/tests/bug00622.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test for bug #622: Working with eval() code is inconvenient and difficult.
+Test for bug #622: Working with eval() code is inconvenient and difficult (< PHP 5.3)
 --SKIPIF--
-<?php if (version_compare(phpversion(), "5.3.0", '>=')) echo "skip < PHP 5.3 needed\n"; ?>
+<?php if (!version_compare(phpversion(), "5.3", '<')) echo "skip < PHP 5.3 needed\n"; ?>
 --FILE--
 <?php
 require 'dbgp/dbgpclient.php';
diff --git a/tests/bug00623.phpt b/tests/bug00623.phpt
index 6b8e2f369..d7730c5f8 100644
--- a/tests/bug00623.phpt
+++ b/tests/bug00623.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #623: Static properties of a class can be evaluated only with difficulty.
+Test for bug #623: Static properties of a class can be evaluated only with difficulty
 --FILE--
 <?php
 require 'dbgp/dbgpclient.php';
diff --git a/tests/bug00631.phpt b/tests/bug00631.phpt
index b3bb5118b..de802ee66 100644
--- a/tests/bug00631.phpt
+++ b/tests/bug00631.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #631: Summary not written when script ended with "exit()".
+Test for bug #631: Summary not written when script ended with "exit()"
 --INI--
 xdebug.profiler_enable=1
 --FILE--
diff --git a/tests/bug00665.phpt b/tests/bug00665.phpt
index e0f5dbf44..ddb709012 100644
--- a/tests/bug00665.phpt
+++ b/tests/bug00665.phpt
@@ -1,8 +1,7 @@
 --TEST--
 Test for bug #665: xdebug does not respect display_errors=stderr
 --SKIPIF--
-<?php if (!extension_loaded("xdebug")) die("skip xdebug required"); ?>
-<?php if (version_compare(phpversion(), "5.2.4", '<')) die("skip display_errors=stderr only supported since PHP 5.2.4"); ?>
+<?php if (!version_compare(phpversion(), "5.2.4", '>=')) echo "skip >= PHP 5.2.4 needed\n"; ?>
 --FILE--
 <?php
 $php = getenv('TEST_PHP_EXECUTABLE') . ' -d log_errors=Off -d xdebug.default_enable=On';
diff --git a/tests/bug00670.phpt b/tests/bug00670.phpt
index 82f4f1bd5..dd14e09cb 100644
--- a/tests/bug00670.phpt
+++ b/tests/bug00670.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #670: Xdebug crashes with broken "break x" code.
+Test for bug #670: Xdebug crashes with broken "break x" code
 --FILE--
 <?php
 xdebug_start_code_coverage( XDEBUG_CC_DEAD_CODE | XDEBUG_CC_UNUSED );
diff --git a/tests/bug00678-2.phpt b/tests/bug00678-2.phpt
index 641efea29..e5493e8ab 100644
--- a/tests/bug00678-2.phpt
+++ b/tests/bug00678-2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #678: XDebug segfault when IDE send "eval NonExistsClass".
+Test for bug #678: Xdebug segfault when IDE send "eval NonExistsClass"
 --FILE--
 <?php
 require 'dbgp/dbgpclient.php';
diff --git a/tests/bug00678.phpt b/tests/bug00678.phpt
index 90ce0e4b6..0613d159f 100644
--- a/tests/bug00678.phpt
+++ b/tests/bug00678.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #678: XDebug segfault when IDE send "eval NonExistsClass".
+Test for bug #678: Xdebug segfault when IDE send "eval NonExistsClass"
 --FILE--
 <?php
 require 'dbgp/dbgpclient.php';
diff --git a/tests/bug00688.phpt b/tests/bug00688.phpt
index c865b4904..c1a01c342 100644
--- a/tests/bug00688.phpt
+++ b/tests/bug00688.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #688: Call to not yet defined function aborts the session.
+Test for bug #688: Call to not yet defined function aborts the session
 --FILE--
 <?php
 require 'dbgp/dbgpclient.php';
diff --git a/tests/bug00689.phpt b/tests/bug00689.phpt
index 26d05c4d9..663f36ef9 100644
--- a/tests/bug00689.phpt
+++ b/tests/bug00689.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #689: Access method of not yet defined variable aborts debug session.
+Test for bug #689: Access method of not yet defined variable aborts debug session
 --FILE--
 <?php
 require 'dbgp/dbgpclient.php';
diff --git a/tests/bug00697.phpt b/tests/bug00697.phpt
index 1c0cee0f1..f482333dd 100644
--- a/tests/bug00697.phpt
+++ b/tests/bug00697.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test for bug #697: Incorrect code coverage of function arguments when using XDEBUG_CC_UNUSED.
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
+Test for bug #697: Incorrect code coverage of function arguments when using XDEBUG_CC_UNUSED
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/bug00699.phpt b/tests/bug00699.phpt
index 5401dd678..368b4d7b4 100644
--- a/tests/bug00699.phpt
+++ b/tests/bug00699.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for bug #699: Xdebug gets the filename wrong for the countable interface.
+Test for bug #699: Xdebug gets the filename wrong for the countable interface
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0
diff --git a/tests/bug00703-php51.phpt b/tests/bug00703-php51.phpt
index b69c60b82..b84bce779 100644
--- a/tests/bug00703-php51.phpt
+++ b/tests/bug00703-php51.phpt
@@ -1,8 +1,7 @@
 --TEST--
-Test for bug #703: Line in heredoc marked as not executed (PHP = 5.1).
+Test for bug #703: Line in heredoc marked as not executed (< PHP 5.2)
 --SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if (version_compare(phpversion(), "5.2.0", '>=')) echo "skip Test for PHP 5.1"; ?>
+<?php if (!version_compare(phpversion(), "5.2", '<')) echo "skip < PHP 5.2 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/bug00703.phpt b/tests/bug00703.phpt
index 24cc87ea0..8b3239c61 100644
--- a/tests/bug00703.phpt
+++ b/tests/bug00703.phpt
@@ -1,8 +1,7 @@
 --TEST--
-Test for bug #703: Line in heredoc marked as not executed (PHP >= 5.2)
+Test for bug #703: Line in heredoc marked as not executed (>= PHP 5.2)
 --SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if (version_compare(phpversion(), "5.2.0", '<')) echo "skip Test for PHP 5.2 and greater"; ?>
+<?php if (!version_compare(phpversion(), "5.2", '>=')) echo "skip >= PHP 5.2 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/bug00709.phpt b/tests/bug00709.phpt
index 40258ff55..55d103538 100644
--- a/tests/bug00709.phpt
+++ b/tests/bug00709.phpt
@@ -1,8 +1,7 @@
 --TEST--
-Test for bug #709: Xdebug doesn't understand E_USER_DEPRECATED.
+Test for bug #709: Xdebug doesn't understand E_USER_DEPRECATED (>= PHP 5.3)
 --SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if (version_compare(phpversion(), "5.3.0", '<')) echo "skip Feature only supported in PHP 5.3 and greater"; ?>
+<?php if (!version_compare(phpversion(), "5.3", '>=')) echo "skip >= PHP 5.3 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.trace_format=0
diff --git a/tests/call_user_func_array.phpt b/tests/call_user_func_array.phpt
index 36c79b7da..54985a259 100644
--- a/tests/call_user_func_array.phpt
+++ b/tests/call_user_func_array.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test for file/line correctness with call_user_func_array()
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/call_user_func_array2.phpt b/tests/call_user_func_array2.phpt
index cc56c8f12..ee1019fa5 100644
--- a/tests/call_user_func_array2.phpt
+++ b/tests/call_user_func_array2.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test call_user_func_array() with multiple files
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/coverage.phpt b/tests/coverage.phpt
index be95a33b4..ed527dea9 100644
--- a/tests/coverage.phpt
+++ b/tests/coverage.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test with Code Coverage (ZE2)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
+Test with Code Coverage
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/coverage2.phpt b/tests/coverage2.phpt
index 1de1b4718..339ce85d1 100644
--- a/tests/coverage2.phpt
+++ b/tests/coverage2.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test with Code Coverage with unused lines (ZE2)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
+Test with Code Coverage with unused lines
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/coverage3.phpt b/tests/coverage3.phpt
index 2f7712646..a0d3859ed 100644
--- a/tests/coverage3.phpt
+++ b/tests/coverage3.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test with Code Coverage with unused lines (ZE2)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
+Test with Code Coverage with unused lines
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/coverage4.phpt b/tests/coverage4.phpt
index 97cb914ef..433a3a0fa 100644
--- a/tests/coverage4.phpt
+++ b/tests/coverage4.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test with Code Coverage with abstract methods (ZE2)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
+Test with Code Coverage with abstract methods
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/exception.phpt b/tests/exception.phpt
index 2cea0ab76..d67182948 100644
--- a/tests/exception.phpt
+++ b/tests/exception.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test to see if exceptions still work with Xdebug's hook enabled.
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 only\n"; ?>
+Test to see if exceptions still work with Xdebug's hook enabled
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/function_counter.phpt b/tests/function_counter.phpt
index 72edb0107..f1fc9b0b1 100644
--- a/tests/function_counter.phpt
+++ b/tests/function_counter.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test for xdebug_get_function_count
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.enable=1
 xdebug.collect_params=1
diff --git a/tests/functrace_comp_0.phpt b/tests/functrace_comp_0.phpt
index 96d26cdf6..b1f417e15 100644
--- a/tests/functrace_comp_0.phpt
+++ b/tests/functrace_comp_0.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test computerized function traces (level0, comp)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0
diff --git a/tests/functrace_comp_1.phpt b/tests/functrace_comp_1.phpt
index f225b44f1..2e67562e0 100644
--- a/tests/functrace_comp_1.phpt
+++ b/tests/functrace_comp_1.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test computerized function traces (level1, comp)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0
diff --git a/tests/functrace_comp_2.phpt b/tests/functrace_comp_2.phpt
index 27f3e43d5..37d2f1fed 100644
--- a/tests/functrace_comp_2.phpt
+++ b/tests/functrace_comp_2.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test computerized function traces (level2, comp)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0
diff --git a/tests/functrace_comp_3.phpt b/tests/functrace_comp_3.phpt
index 3b2e4466b..ce31ac05e 100644
--- a/tests/functrace_comp_3.phpt
+++ b/tests/functrace_comp_3.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test computerized function traces (level3, comp)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0
diff --git a/tests/functrace_comp_4.phpt b/tests/functrace_comp_4.phpt
index 06eb2d19c..d5dc38ef4 100644
--- a/tests/functrace_comp_4.phpt
+++ b/tests/functrace_comp_4.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test computerized function traces (level4, comp)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0
diff --git a/tests/get_declared_vars.phpt b/tests/get_declared_vars.phpt
index 065db085e..1a1b49162 100644
--- a/tests/get_declared_vars.phpt
+++ b/tests/get_declared_vars.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test with xdebug_get_declared_vars()
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/local_vars_in_error.phpt b/tests/local_vars_in_error.phpt
index 8bb119437..2a33a3d36 100644
--- a/tests/local_vars_in_error.phpt
+++ b/tests/local_vars_in_error.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test with showing local variables on errors (ZE2)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
+Test with showing local variables on errors
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/memory_usage.phpt b/tests/memory_usage.phpt
index dc1ff06ed..cce9e1776 100644
--- a/tests/memory_usage.phpt
+++ b/tests/memory_usage.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test for xdebug.collect_params setting
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.enable=1
 xdebug.collect_params=1
diff --git a/tests/peak_memory_usage.phpt b/tests/peak_memory_usage.phpt
index 576d85318..49ae334cb 100644
--- a/tests/peak_memory_usage.phpt
+++ b/tests/peak_memory_usage.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test for xdebug_peak_memory_usage
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.enable=1
 xdebug.collect_params=3
diff --git a/tests/scream.phpt b/tests/scream.phpt
index 8762d0045..5e9849ddd 100644
--- a/tests/scream.phpt
+++ b/tests/scream.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Test for scream support.
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
+Test for scream support
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/shutdown.phpt b/tests/shutdown.phpt
index 8fec15ec9..05bcbbdc1 100644
--- a/tests/shutdown.phpt
+++ b/tests/shutdown.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Shutdown function
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=1
diff --git a/tests/stacktrace_html_0.phpt b/tests/stacktrace_html_0.phpt
index 84cc33713..8dd4e2797 100644
--- a/tests/stacktrace_html_0.phpt
+++ b/tests/stacktrace_html_0.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test stack traces (level0, html)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0
diff --git a/tests/stacktrace_html_1.phpt b/tests/stacktrace_html_1.phpt
index 353b92cc1..16546ac10 100644
--- a/tests/stacktrace_html_1.phpt
+++ b/tests/stacktrace_html_1.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test stack traces (level1, html)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0
diff --git a/tests/stacktrace_html_2.phpt b/tests/stacktrace_html_2.phpt
index 24238a182..ab998d81b 100644
--- a/tests/stacktrace_html_2.phpt
+++ b/tests/stacktrace_html_2.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test stack traces (level2, html)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0
diff --git a/tests/stacktrace_html_3.phpt b/tests/stacktrace_html_3.phpt
index 0285e064d..d265abec6 100644
--- a/tests/stacktrace_html_3.phpt
+++ b/tests/stacktrace_html_3.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test stack traces (level3, html)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0
diff --git a/tests/stacktrace_html_4.phpt b/tests/stacktrace_html_4.phpt
index 6d5022c57..54f68509c 100644
--- a/tests/stacktrace_html_4.phpt
+++ b/tests/stacktrace_html_4.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test stack traces (level4, html)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0
diff --git a/tests/stacktrace_html_4_novar.phpt b/tests/stacktrace_html_4_novar.phpt
index fb874be47..c831af8d4 100644
--- a/tests/stacktrace_html_4_novar.phpt
+++ b/tests/stacktrace_html_4_novar.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test stack traces (level4, html)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0
diff --git a/tests/stacktrace_text_0.phpt b/tests/stacktrace_text_0.phpt
index 0ff69165f..ea3b649f5 100644
--- a/tests/stacktrace_text_0.phpt
+++ b/tests/stacktrace_text_0.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test stack traces (level0, text)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0
diff --git a/tests/stacktrace_text_1.phpt b/tests/stacktrace_text_1.phpt
index 4f60c0e69..64d58e752 100644
--- a/tests/stacktrace_text_1.phpt
+++ b/tests/stacktrace_text_1.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test stack traces (level1, text)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0
diff --git a/tests/stacktrace_text_2.phpt b/tests/stacktrace_text_2.phpt
index 117423ed3..662fe74c6 100644
--- a/tests/stacktrace_text_2.phpt
+++ b/tests/stacktrace_text_2.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test stack traces (level2, text)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0
diff --git a/tests/stacktrace_text_3.phpt b/tests/stacktrace_text_3.phpt
index 290177bbe..74910f373 100644
--- a/tests/stacktrace_text_3.phpt
+++ b/tests/stacktrace_text_3.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test stack traces (level3, text)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0
diff --git a/tests/stacktrace_text_4.phpt b/tests/stacktrace_text_4.phpt
index d5f7a7f7d..5daa3ef20 100644
--- a/tests/stacktrace_text_4.phpt
+++ b/tests/stacktrace_text_4.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test stack traces (level4, text)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0
diff --git a/tests/stacktrace_text_4_novar.phpt b/tests/stacktrace_text_4_novar.phpt
index 4fc607849..88acd2df6 100644
--- a/tests/stacktrace_text_4_novar.phpt
+++ b/tests/stacktrace_text_4_novar.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test stack traces (level4, text)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0
diff --git a/tests/start_trace.phpt b/tests/start_trace.phpt
index 658266f5d..13b96e946 100644
--- a/tests/start_trace.phpt
+++ b/tests/start_trace.phpt
@@ -1,7 +1,5 @@
 --TEST--
 xdebug_start_trace() without filename
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/test1.phpt b/tests/test1.phpt
index 053a68974..179547582 100644
--- a/tests/test1.phpt
+++ b/tests/test1.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test with include file
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.auto_trace=0
 xdebug.collect_params=3
diff --git a/tests/test10b.phpt b/tests/test10b.phpt
index 01287d85a..df1c4bf3e 100644
--- a/tests/test10b.phpt
+++ b/tests/test10b.phpt
@@ -1,8 +1,5 @@
 --TEST--
 Test for nested indirect function call
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/test11.phpt b/tests/test11.phpt
index 5528f2cbe..0761eefc4 100644
--- a/tests/test11.phpt
+++ b/tests/test11.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test for indirect function call
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/test12.phpt b/tests/test12.phpt
index 99a178509..6dfc43a4b 100644
--- a/tests/test12.phpt
+++ b/tests/test12.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test for complex parameters to functions
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/test13.phpt b/tests/test13.phpt
index 44b1fc1fb..53cf126f0 100644
--- a/tests/test13.phpt
+++ b/tests/test13.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test for variable function calls
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/test14b.phpt b/tests/test14b.phpt
index 6e8624e77..8e9349d8d 100644
--- a/tests/test14b.phpt
+++ b/tests/test14b.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test for circular references (ZE2)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
+Test for circular references
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/test15.phpt b/tests/test15.phpt
index a95e78834..b9b491ffe 100644
--- a/tests/test15.phpt
+++ b/tests/test15.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test for variable member functions
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/test16b.phpt b/tests/test16b.phpt
index f1d5a2f31..5d3d7aabb 100644
--- a/tests/test16b.phpt
+++ b/tests/test16b.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test for overloaded member functions / classes (ZE2)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
+Test for overloaded member functions / classes
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/test17.phpt b/tests/test17.phpt
index 47d5b443a..729f70eb8 100644
--- a/tests/test17.phpt
+++ b/tests/test17.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test for internal parameters
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/test18.phpt b/tests/test18.phpt
index a19fd3073..56532cd2f 100644
--- a/tests/test18.phpt
+++ b/tests/test18.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test with eval()
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/test18a.phpt b/tests/test18a.phpt
index 7f3c01407..821d4bc03 100644
--- a/tests/test18a.phpt
+++ b/tests/test18a.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test with eval()
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/test18b.phpt b/tests/test18b.phpt
index f6a8aac46..cf9e4e9c7 100644
--- a/tests/test18b.phpt
+++ b/tests/test18b.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test with eval()
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/test19.phpt b/tests/test19.phpt
index aa6f15937..23a4476e8 100644
--- a/tests/test19.phpt
+++ b/tests/test19.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test for lots of calls to internal functions
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/test20b.phpt b/tests/test20b.phpt
index 08a3f78cf..4a3bbbff3 100644
--- a/tests/test20b.phpt
+++ b/tests/test20b.phpt
@@ -1,8 +1,5 @@
 --TEST--
 Test for static method calls
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/test3.phpt b/tests/test3.phpt
index ae1fa162f..19542e1d2 100644
--- a/tests/test3.phpt
+++ b/tests/test3.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test for xdebug_is_enabled, xdebug_disable and xdebug_enable
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0
diff --git a/tests/test4.phpt b/tests/test4.phpt
index d712b9ddc..a4aa47bcf 100644
--- a/tests/test4.phpt
+++ b/tests/test4.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test for simple backtrace
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.dump_globals=0
diff --git a/tests/test5.phpt b/tests/test5.phpt
index c092aa03f..734036752 100644
--- a/tests/test5.phpt
+++ b/tests/test5.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test for somewhat more complex backtrace
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.dump_globals=0
diff --git a/tests/test6.phpt b/tests/test6.phpt
index e5890d655..026a76d75 100644
--- a/tests/test6.phpt
+++ b/tests/test6.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test for complex parameters to a function (ZE2)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
+Test for complex parameters to a function
 --INI--
 xdebug.default_enable=1
 xdebug.collect_params=1
diff --git a/tests/test7b.phpt b/tests/test7b.phpt
index 066adc775..82ab1fe54 100644
--- a/tests/test7b.phpt
+++ b/tests/test7b.phpt
@@ -1,8 +1,5 @@
 --TEST--
 Test for class members
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/test8.phpt b/tests/test8.phpt
index bdae8b629..b8ab47923 100644
--- a/tests/test8.phpt
+++ b/tests/test8.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test for nested function calls
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/test9b.phpt b/tests/test9b.phpt
index fd5f85529..88f5dbfe7 100644
--- a/tests/test9b.phpt
+++ b/tests/test9b.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test for nested static method calls (ZE2)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
+Test for nested static method calls
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/trace.phpt b/tests/trace.phpt
index 1d03d2d50..9ff112602 100644
--- a/tests/trace.phpt
+++ b/tests/trace.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Trace test with fibonacci numbers (format=0)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/trace1.phpt b/tests/trace1.phpt
index e94e36d9b..10854a2cd 100644
--- a/tests/trace1.phpt
+++ b/tests/trace1.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Trace test with fibonacci numbers (format=1)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/trace2.phpt b/tests/trace2.phpt
index f28ac56e6..dd6d9aa5b 100644
--- a/tests/trace2.phpt
+++ b/tests/trace2.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Trace test with fibonacci numbers (format=2)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
 --INI--
 xdebug.enable=1
 xdebug.auto_trace=0
diff --git a/tests/trace_with_magic_methods.phpt b/tests/trace_with_magic_methods.phpt
index 537b87b93..503baae6e 100644
--- a/tests/trace_with_magic_methods.phpt
+++ b/tests/trace_with_magic_methods.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for line numbers for __get, __set, __isset, __unset and __call.
+Test for line numbers for __get, __set, __isset, __unset and __call
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0
diff --git a/tests/xdebug_call.phpt b/tests/xdebug_call.phpt
index 13f69e1be..42d9aafbd 100644
--- a/tests/xdebug_call.phpt
+++ b/tests/xdebug_call.phpt
@@ -1,8 +1,5 @@
 --TEST--
 Test for xdebug_call_*()
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/xdebug_call_depth.phpt b/tests/xdebug_call_depth.phpt
index a04cc351b..884170489 100644
--- a/tests/xdebug_call_depth.phpt
+++ b/tests/xdebug_call_depth.phpt
@@ -1,8 +1,5 @@
 --TEST--
 Test for xdebug_call_*(1)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/xdebug_call_depth2.phpt b/tests/xdebug_call_depth2.phpt
index f4a0db0b3..f29211321 100644
--- a/tests/xdebug_call_depth2.phpt
+++ b/tests/xdebug_call_depth2.phpt
@@ -1,8 +1,5 @@
 --TEST--
 Test for xdebug_call_*(2)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/xdebug_var_dump.phpt b/tests/xdebug_var_dump.phpt
index ebe9c0068..d88f80967 100644
--- a/tests/xdebug_var_dump.phpt
+++ b/tests/xdebug_var_dump.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test for correct display with xdebug_var_dump() (ZE2)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
+Test for correct display with xdebug_var_dump()
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0
diff --git a/tests/xdebug_var_dump_non_overload.phpt b/tests/xdebug_var_dump_non_overload.phpt
index c7b8fdf7b..b47f06039 100644
--- a/tests/xdebug_var_dump_non_overload.phpt
+++ b/tests/xdebug_var_dump_non_overload.phpt
@@ -1,8 +1,5 @@
 --TEST--
-Test for correct display with non overloaded var_dump() (ZE2)
---SKIPIF--
-<?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
+Test for correct display with non overloaded var_dump()
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0