Remove zend_version() checks from tests

118 files changed, 0 insertions, 230 deletions

diff --git a/tests/classes/__call_001.phpt b/tests/classes/__call_001.phpt
index f9708e04f1..be2d0248cc 100644
--- a/tests/classes/__call_001.phpt
+++ b/tests/classes/__call_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 __call()
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/__call_002.phpt b/tests/classes/__call_002.phpt
index 53a179f787..f58ec47dcb 100644
--- a/tests/classes/__call_002.phpt
+++ b/tests/classes/__call_002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 __call() signature check
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/__set__get_001.phpt b/tests/classes/__set__get_001.phpt
index beb688c222..3c9cb09b4a 100644
--- a/tests/classes/__set__get_001.phpt
+++ b/tests/classes/__set__get_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 __set() and __get()
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class setter {
diff --git a/tests/classes/__set__get_002.phpt b/tests/classes/__set__get_002.phpt
index 71111ccdf8..5d3b5db543 100644
--- a/tests/classes/__set__get_002.phpt
+++ b/tests/classes/__set__get_002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 __get() signature check
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class Test {
diff --git a/tests/classes/__set__get_003.phpt b/tests/classes/__set__get_003.phpt
index 390d303362..16b09b76b1 100644
--- a/tests/classes/__set__get_003.phpt
+++ b/tests/classes/__set__get_003.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 __set() signature check
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class Test {
diff --git a/tests/classes/__set__get_004.phpt b/tests/classes/__set__get_004.phpt
index e3061da4f0..523cccee1e 100644
--- a/tests/classes/__set__get_004.phpt
+++ b/tests/classes/__set__get_004.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 __set() and __get()
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class Test {
diff --git a/tests/classes/__set__get_005.phpt b/tests/classes/__set__get_005.phpt
index d8bbad3d45..fd23cf6276 100644
--- a/tests/classes/__set__get_005.phpt
+++ b/tests/classes/__set__get_005.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 __set() and __get()
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class Test
diff --git a/tests/classes/__set_data_corrupt.phpt b/tests/classes/__set_data_corrupt.phpt
index 6a52bd489b..8b51302ab3 100644
--- a/tests/classes/__set_data_corrupt.phpt
+++ b/tests/classes/__set_data_corrupt.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 Data corruption in __set
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); ?>
 --FILE--
 <?php
 $f = 'c="foo"';
diff --git a/tests/classes/abstract.phpt b/tests/classes/abstract.phpt
index 5852005f43..f46e5130a7 100644
--- a/tests/classes/abstract.phpt
+++ b/tests/classes/abstract.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 An abstract method may not be called
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/abstract_class.phpt b/tests/classes/abstract_class.phpt
index 2085bff009..fabe890eae 100644
--- a/tests/classes/abstract_class.phpt
+++ b/tests/classes/abstract_class.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 An abstract class cannot be instantiated
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/abstract_derived.phpt b/tests/classes/abstract_derived.phpt
index 0feceac6bb..21f8fd8788 100644
--- a/tests/classes/abstract_derived.phpt
+++ b/tests/classes/abstract_derived.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A derived class with an abstract method must be abstract
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/abstract_final.phpt b/tests/classes/abstract_final.phpt
index 20c7ae375f..cdf61d17e7 100644
--- a/tests/classes/abstract_final.phpt
+++ b/tests/classes/abstract_final.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A final method cannot be abstract
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/abstract_inherit.phpt b/tests/classes/abstract_inherit.phpt
index 583043d22b..1acf19d7c0 100644
--- a/tests/classes/abstract_inherit.phpt
+++ b/tests/classes/abstract_inherit.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A class that inherits an abstract method is abstract
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/abstract_not_declared.phpt b/tests/classes/abstract_not_declared.phpt
index 3b81cd4980..8c2d880150 100644
--- a/tests/classes/abstract_not_declared.phpt
+++ b/tests/classes/abstract_not_declared.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 An abstract class must be declared abstract
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/abstract_redeclare.phpt b/tests/classes/abstract_redeclare.phpt
index 9a0a1edc3c..8e09a3a12b 100644
--- a/tests/classes/abstract_redeclare.phpt
+++ b/tests/classes/abstract_redeclare.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A method cannot be redeclared abstract
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/autoload_001.phpt b/tests/classes/autoload_001.phpt
index 6f325f49bb..6b520b701a 100644
--- a/tests/classes/autoload_001.phpt
+++ b/tests/classes/autoload_001.phpt
@@ -2,7 +2,6 @@
 ZE2 Autoload and class_exists
 --SKIPIF--
 <?php 
-	if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); 
 	if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
 ?>
 --FILE--
diff --git a/tests/classes/autoload_002.phpt b/tests/classes/autoload_002.phpt
index 27dea0f9d4..582cb460f4 100644
--- a/tests/classes/autoload_002.phpt
+++ b/tests/classes/autoload_002.phpt
@@ -2,7 +2,6 @@
 ZE2 Autoload and get_class_methods
 --SKIPIF--
 <?php 
-	if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); 
 	if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
 ?>
 --FILE--
diff --git a/tests/classes/autoload_003.phpt b/tests/classes/autoload_003.phpt
index 7bdb5da36a..41e877cdd9 100644
--- a/tests/classes/autoload_003.phpt
+++ b/tests/classes/autoload_003.phpt
@@ -2,7 +2,6 @@
 ZE2 Autoload and derived classes
 --SKIPIF--
 <?php 
-	if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); 
 	if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
 ?>
 --FILE--
diff --git a/tests/classes/autoload_004.phpt b/tests/classes/autoload_004.phpt
index 23aea5d086..88b10b50d7 100644
--- a/tests/classes/autoload_004.phpt
+++ b/tests/classes/autoload_004.phpt
@@ -2,7 +2,6 @@
 ZE2 Autoload and recursion
 --SKIPIF--
 <?php 
-	if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); 
 	if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
 ?>
 --FILE--
diff --git a/tests/classes/autoload_005.phpt b/tests/classes/autoload_005.phpt
index 36a4e18f0b..c5741396d5 100644
--- a/tests/classes/autoload_005.phpt
+++ b/tests/classes/autoload_005.phpt
@@ -2,7 +2,6 @@
 ZE2 Autoload from destructor
 --SKIPIF--
 <?php 
-	if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); 
 	if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
 ?>
 --FILE--
diff --git a/tests/classes/autoload_006.phpt b/tests/classes/autoload_006.phpt
index 9af6fc9829..173b87db04 100644
--- a/tests/classes/autoload_006.phpt
+++ b/tests/classes/autoload_006.phpt
@@ -2,7 +2,6 @@
 ZE2 Autoload from destructor
 --SKIPIF--
 <?php 
-	if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); 
 	if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
 ?>
 --FILE--
diff --git a/tests/classes/class_abstract.phpt b/tests/classes/class_abstract.phpt
index 10fcdba461..fe95d9bcc3 100644
--- a/tests/classes/class_abstract.phpt
+++ b/tests/classes/class_abstract.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 An abstract class cannot be instanciated
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/class_final.phpt b/tests/classes/class_final.phpt
index 5c73cb2556..45cbc72751 100644
--- a/tests/classes/class_final.phpt
+++ b/tests/classes/class_final.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A final class cannot be inherited
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/clone_001.phpt b/tests/classes/clone_001.phpt
index eb06c1f520..e1d200be26 100644
--- a/tests/classes/clone_001.phpt
+++ b/tests/classes/clone_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 object cloning, 1
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class test {
diff --git a/tests/classes/clone_002.phpt b/tests/classes/clone_002.phpt
index 4430a2cab4..b2f73b4b80 100644
--- a/tests/classes/clone_002.phpt
+++ b/tests/classes/clone_002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 object cloning, 2
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class test {
diff --git a/tests/classes/clone_003.phpt b/tests/classes/clone_003.phpt
index 9a251c506f..e595a59066 100644
--- a/tests/classes/clone_003.phpt
+++ b/tests/classes/clone_003.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 object cloning, 3
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class base {
diff --git a/tests/classes/clone_006.phpt b/tests/classes/clone_006.phpt
index 713670aba8..d8a6140358 100644
--- a/tests/classes/clone_006.phpt
+++ b/tests/classes/clone_006.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 object cloning, 6
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --INI--
 error_reporting=2047
 --FILE--
diff --git a/tests/classes/constants_scope_001.phpt b/tests/classes/constants_scope_001.phpt
index 50066282ea..c2585b2212 100644
--- a/tests/classes/constants_scope_001.phpt
+++ b/tests/classes/constants_scope_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 class constants and scope
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/ctor_dtor.phpt b/tests/classes/ctor_dtor.phpt
index 6af863e576..3f57a312e4 100644
--- a/tests/classes/ctor_dtor.phpt
+++ b/tests/classes/ctor_dtor.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 The new constructor/destructor is called
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/ctor_dtor_inheritance.phpt b/tests/classes/ctor_dtor_inheritance.phpt
index 8ae2a5dec4..fc43727d2a 100644
--- a/tests/classes/ctor_dtor_inheritance.phpt
+++ b/tests/classes/ctor_dtor_inheritance.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A derived class can use the inherited constructor/destructor
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/dereferencing_001.phpt b/tests/classes/dereferencing_001.phpt
index 886baeb288..e7e90cf5e3 100644
--- a/tests/classes/dereferencing_001.phpt
+++ b/tests/classes/dereferencing_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 dereferencing of objects from methods
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/destructor_inheritance.phpt b/tests/classes/destructor_inheritance.phpt
index 868c8960c8..f267a740ae 100644
--- a/tests/classes/destructor_inheritance.phpt
+++ b/tests/classes/destructor_inheritance.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 The inherited destructor is called
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class base {
diff --git a/tests/classes/destructor_visibility_001.phpt b/tests/classes/destructor_visibility_001.phpt
index b99c0b20ca..b48d000f91 100644
--- a/tests/classes/destructor_visibility_001.phpt
+++ b/tests/classes/destructor_visibility_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 Ensuring destructor visibility
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/destructor_visibility_002.phpt b/tests/classes/destructor_visibility_002.phpt
index 2cc83334a9..96cf275a7c 100644
--- a/tests/classes/destructor_visibility_002.phpt
+++ b/tests/classes/destructor_visibility_002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 Ensuring destructor visibility
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/destructor_visibility_003.phpt b/tests/classes/destructor_visibility_003.phpt
index 83e3efe22e..4f75166940 100644
--- a/tests/classes/destructor_visibility_003.phpt
+++ b/tests/classes/destructor_visibility_003.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 Ensuring destructor visibility
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/factory_001.phpt b/tests/classes/factory_001.phpt
index 97b69c1b47..45f97331a5 100644
--- a/tests/classes/factory_001.phpt
+++ b/tests/classes/factory_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 factory objects
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/factory_and_singleton_001.phpt b/tests/classes/factory_and_singleton_001.phpt
index 70fa020a49..970c017f4b 100644
--- a/tests/classes/factory_and_singleton_001.phpt
+++ b/tests/classes/factory_and_singleton_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 factory and singleton, test 1
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class test {
diff --git a/tests/classes/factory_and_singleton_002.phpt b/tests/classes/factory_and_singleton_002.phpt
index 3308a561a5..4812571497 100644
--- a/tests/classes/factory_and_singleton_002.phpt
+++ b/tests/classes/factory_and_singleton_002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 factory and singleton, test 2
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class test {
diff --git a/tests/classes/factory_and_singleton_003.phpt b/tests/classes/factory_and_singleton_003.phpt
index e312f55442..cf08fdb717 100644
--- a/tests/classes/factory_and_singleton_003.phpt
+++ b/tests/classes/factory_and_singleton_003.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 factory and singleton, test 3
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class test {
diff --git a/tests/classes/factory_and_singleton_004.phpt b/tests/classes/factory_and_singleton_004.phpt
index a8a2f1d7c5..41e278bdb9 100644
--- a/tests/classes/factory_and_singleton_004.phpt
+++ b/tests/classes/factory_and_singleton_004.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 factory and singleton, test 4
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class test {
diff --git a/tests/classes/factory_and_singleton_005.phpt b/tests/classes/factory_and_singleton_005.phpt
index 2bb328da7e..78d7e05f0b 100644
--- a/tests/classes/factory_and_singleton_005.phpt
+++ b/tests/classes/factory_and_singleton_005.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 factory and singleton, test 5
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class test {
diff --git a/tests/classes/factory_and_singleton_006.phpt b/tests/classes/factory_and_singleton_006.phpt
index 5e1c7092d1..5bc9433e32 100644
--- a/tests/classes/factory_and_singleton_006.phpt
+++ b/tests/classes/factory_and_singleton_006.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 factory and singleton, test 6
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class test {
diff --git a/tests/classes/factory_and_singleton_007.phpt b/tests/classes/factory_and_singleton_007.phpt
index b55168efe5..4c15c38383 100644
--- a/tests/classes/factory_and_singleton_007.phpt
+++ b/tests/classes/factory_and_singleton_007.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 factory and singleton, test 7
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class test {
diff --git a/tests/classes/factory_and_singleton_008.phpt b/tests/classes/factory_and_singleton_008.phpt
index 49d4f0a1ff..1a87833169 100644
--- a/tests/classes/factory_and_singleton_008.phpt
+++ b/tests/classes/factory_and_singleton_008.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 factory and singleton, test 8
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class test {
diff --git a/tests/classes/factory_and_singleton_009.phpt b/tests/classes/factory_and_singleton_009.phpt
index acf792c316..9134245a17 100644
--- a/tests/classes/factory_and_singleton_009.phpt
+++ b/tests/classes/factory_and_singleton_009.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 factory and singleton, test 9
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class test {
diff --git a/tests/classes/factory_and_singleton_010.phpt b/tests/classes/factory_and_singleton_010.phpt
index 0f5fb2dc74..bd7e7e32b7 100644
--- a/tests/classes/factory_and_singleton_010.phpt
+++ b/tests/classes/factory_and_singleton_010.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 factory and singleton, test 10
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class test {
diff --git a/tests/classes/final.phpt b/tests/classes/final.phpt
index bf3a0cb937..f82087749b 100644
--- a/tests/classes/final.phpt
+++ b/tests/classes/final.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A method may be redeclared final
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/final_abstract.phpt b/tests/classes/final_abstract.phpt
index 426c852cfc..25c2cfc810 100644
--- a/tests/classes/final_abstract.phpt
+++ b/tests/classes/final_abstract.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A final method cannot be abstract
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/final_redeclare.phpt b/tests/classes/final_redeclare.phpt
index e8f2e6ff09..bdcbf3c86c 100644
--- a/tests/classes/final_redeclare.phpt
+++ b/tests/classes/final_redeclare.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A final method may not be overwritten
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/inheritance_002.phpt b/tests/classes/inheritance_002.phpt
index 7669f735e5..f88c0996bd 100644
--- a/tests/classes/inheritance_002.phpt
+++ b/tests/classes/inheritance_002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 Constructor precedence
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class Base_php4 {
diff --git a/tests/classes/interface_and_extends.phpt b/tests/classes/interface_and_extends.phpt
index f9040ae4a9..1c23d31ca6 100644
--- a/tests/classes/interface_and_extends.phpt
+++ b/tests/classes/interface_and_extends.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 a class cannot extend an interface 
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/interface_class.phpt b/tests/classes/interface_class.phpt
index 22520de1f9..46deb490ed 100644
--- a/tests/classes/interface_class.phpt
+++ b/tests/classes/interface_class.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A class can only implement interfaces
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class base {
diff --git a/tests/classes/interface_doubled.phpt b/tests/classes/interface_doubled.phpt
index e1dd31fd4d..bcf2fbda8f 100644
--- a/tests/classes/interface_doubled.phpt
+++ b/tests/classes/interface_doubled.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 An interface extends base interfaces
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/interface_implemented.phpt b/tests/classes/interface_implemented.phpt
index e33a4da002..f0507dea1c 100644
--- a/tests/classes/interface_implemented.phpt
+++ b/tests/classes/interface_implemented.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 An interface is inherited
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/interface_instantiate.phpt b/tests/classes/interface_instantiate.phpt
index 70e2e3e8b6..dffd6b10e2 100644
--- a/tests/classes/interface_instantiate.phpt
+++ b/tests/classes/interface_instantiate.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 An interface cannot be instantiated
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/interface_member.phpt b/tests/classes/interface_member.phpt
index 329c0728b5..3b50b30ffe 100644
--- a/tests/classes/interface_member.phpt
+++ b/tests/classes/interface_member.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 An interface cannot have properties
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/interface_method.phpt b/tests/classes/interface_method.phpt
index f80bd756f3..f3e465b21b 100644
--- a/tests/classes/interface_method.phpt
+++ b/tests/classes/interface_method.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 An interface method must be abstract
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/interface_method_final.phpt b/tests/classes/interface_method_final.phpt
index 01e599c5b9..74c86f1e50 100644
--- a/tests/classes/interface_method_final.phpt
+++ b/tests/classes/interface_method_final.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 An interface method cannot be final
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/interface_method_private.phpt b/tests/classes/interface_method_private.phpt
index aa46a033a6..000b33fae4 100644
--- a/tests/classes/interface_method_private.phpt
+++ b/tests/classes/interface_method_private.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 An interface method cannot be private
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/interface_must_be_implemented.phpt b/tests/classes/interface_must_be_implemented.phpt
index a4d79704e1..cd7c815f50 100644
--- a/tests/classes/interface_must_be_implemented.phpt
+++ b/tests/classes/interface_must_be_implemented.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 An interface must be implemented
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/interface_optional_arg.phpt b/tests/classes/interface_optional_arg.phpt
index 05f2fc41df..9c0de6cfb0 100644
--- a/tests/classes/interface_optional_arg.phpt
+++ b/tests/classes/interface_optional_arg.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 An interface method allows additional default arguments
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/interface_optional_arg_002.phpt b/tests/classes/interface_optional_arg_002.phpt
index 9987e925e0..67e6785883 100644
--- a/tests/classes/interface_optional_arg_002.phpt
+++ b/tests/classes/interface_optional_arg_002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 default argument value in interface implementation
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/interfaces_001.phpt b/tests/classes/interfaces_001.phpt
index 68f85512e7..d8d801192f 100644
--- a/tests/classes/interfaces_001.phpt
+++ b/tests/classes/interfaces_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 interfaces
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/interfaces_002.phpt b/tests/classes/interfaces_002.phpt
index 803598be6d..fad961bf27 100644
--- a/tests/classes/interfaces_002.phpt
+++ b/tests/classes/interfaces_002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 interface with an unimplemented method
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/iterators_001.phpt b/tests/classes/iterators_001.phpt
index 02e3610782..548bed53ce 100644
--- a/tests/classes/iterators_001.phpt
+++ b/tests/classes/iterators_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 iterators and foreach
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class c_iter implements Iterator {
diff --git a/tests/classes/iterators_002.phpt b/tests/classes/iterators_002.phpt
index 4a58be0324..6f93d1e1f9 100644
--- a/tests/classes/iterators_002.phpt
+++ b/tests/classes/iterators_002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 iterators and break
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class c_iter implements Iterator {
diff --git a/tests/classes/iterators_003.phpt b/tests/classes/iterators_003.phpt
index 42695db6ba..71009e0269 100644
--- a/tests/classes/iterators_003.phpt
+++ b/tests/classes/iterators_003.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 iterators and break
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class c_iter implements Iterator {
diff --git a/tests/classes/iterators_004.phpt b/tests/classes/iterators_004.phpt
index 3fe05276c3..df76c7fe31 100644
--- a/tests/classes/iterators_004.phpt
+++ b/tests/classes/iterators_004.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 iterators must be implemented
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/iterators_005.phpt b/tests/classes/iterators_005.phpt
index 005deb92a2..9c330ce89b 100644
--- a/tests/classes/iterators_005.phpt
+++ b/tests/classes/iterators_005.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 iterators cannot implement Traversable alone
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/iterators_006.phpt b/tests/classes/iterators_006.phpt
index e00a00afff..8017a8a360 100644
--- a/tests/classes/iterators_006.phpt
+++ b/tests/classes/iterators_006.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 iterators and array wrapping
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 is needed'); ?> 
 --FILE--
 <?php
 
diff --git a/tests/classes/method_override_optional_arg_001.phpt b/tests/classes/method_override_optional_arg_001.phpt
index bea95756c6..897a2c2b93 100644
--- a/tests/classes/method_override_optional_arg_001.phpt
+++ b/tests/classes/method_override_optional_arg_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Method override allows optional default argument
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/object_reference_001.phpt b/tests/classes/object_reference_001.phpt
index f114d1aa95..ca5bbc5abe 100644
--- a/tests/classes/object_reference_001.phpt
+++ b/tests/classes/object_reference_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 object references
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/private_001.phpt b/tests/classes/private_001.phpt
index 9dba49e743..79b94c4f9a 100644
--- a/tests/classes/private_001.phpt
+++ b/tests/classes/private_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A private method can only be called inside the class
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/private_002.phpt b/tests/classes/private_002.phpt
index 2e8d26b058..892580f36d 100644
--- a/tests/classes/private_002.phpt
+++ b/tests/classes/private_002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A private method cannot be called in another class
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/private_003.phpt b/tests/classes/private_003.phpt
index 397da5d7e2..0843c5ef63 100644
--- a/tests/classes/private_003.phpt
+++ b/tests/classes/private_003.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A private method cannot be called in a derived class
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 ini_set("error_reporting",2039);
diff --git a/tests/classes/private_003b.phpt b/tests/classes/private_003b.phpt
index f14de8e9cd..fe2f464ee8 100644
--- a/tests/classes/private_003b.phpt
+++ b/tests/classes/private_003b.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A private method cannot be called in a derived class
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/private_004.phpt b/tests/classes/private_004.phpt
index 749d6eecc9..13a4e90535 100644
--- a/tests/classes/private_004.phpt
+++ b/tests/classes/private_004.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A private method cannot be called in a derived class
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/private_004b.phpt b/tests/classes/private_004b.phpt
index 8d5cd7c194..db139f65b7 100644
--- a/tests/classes/private_004b.phpt
+++ b/tests/classes/private_004b.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A private method cannot be called in a derived class
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/private_005.phpt b/tests/classes/private_005.phpt
index c09c4285e1..0c6d978f79 100644
--- a/tests/classes/private_005.phpt
+++ b/tests/classes/private_005.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A private method cannot be called in a derived class
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/private_005b.phpt b/tests/classes/private_005b.phpt
index 8d5cd7c194..db139f65b7 100644
--- a/tests/classes/private_005b.phpt
+++ b/tests/classes/private_005b.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A private method cannot be called in a derived class
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/private_006.phpt b/tests/classes/private_006.phpt
index 0bb2b3fe4b..a51c9e70dc 100644
--- a/tests/classes/private_006.phpt
+++ b/tests/classes/private_006.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A private method can be overwritten in a second derived class
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class first {
diff --git a/tests/classes/private_006b.phpt b/tests/classes/private_006b.phpt
index 4084124915..22c3cfd80b 100644
--- a/tests/classes/private_006b.phpt
+++ b/tests/classes/private_006b.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A private method can be overwritten in a second derived class
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/private_007.phpt b/tests/classes/private_007.phpt
index 73a38c4562..f773cc8ed2 100644
--- a/tests/classes/private_007.phpt
+++ b/tests/classes/private_007.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A derived class does not know about privates of ancestors
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/private_007b.phpt b/tests/classes/private_007b.phpt
index 02ddc25dec..cbd0e756de 100644
--- a/tests/classes/private_007b.phpt
+++ b/tests/classes/private_007b.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A derived class does not know about privates of ancestors
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/private_members.phpt b/tests/classes/private_members.phpt
index a8ef9ab920..7ee6d69cf8 100644
--- a/tests/classes/private_members.phpt
+++ b/tests/classes/private_members.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A private member is 
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/protected_001.phpt b/tests/classes/protected_001.phpt
index aabcd1b2b7..44099b18fa 100644
--- a/tests/classes/protected_001.phpt
+++ b/tests/classes/protected_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A protected method can only be called inside the class
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/protected_001b.phpt b/tests/classes/protected_001b.phpt
index d79c1734bb..6f00ffc1b3 100644
--- a/tests/classes/protected_001b.phpt
+++ b/tests/classes/protected_001b.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A protected method can only be called inside the class
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/protected_002.phpt b/tests/classes/protected_002.phpt
index 89872fa513..da87200b6e 100644
--- a/tests/classes/protected_002.phpt
+++ b/tests/classes/protected_002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A protected method cannot be called in another class
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/singleton_001.phpt b/tests/classes/singleton_001.phpt
index ee729b980c..45174158be 100644
--- a/tests/classes/singleton_001.phpt
+++ b/tests/classes/singleton_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 singleton
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/static_mix_1.phpt b/tests/classes/static_mix_1.phpt
index 5146e7096e..71db59663f 100644
--- a/tests/classes/static_mix_1.phpt
+++ b/tests/classes/static_mix_1.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 You cannot overload a static method with a non static method
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/static_mix_2.phpt b/tests/classes/static_mix_2.phpt
index cecb37bdaf..ec657c0d5e 100644
--- a/tests/classes/static_mix_2.phpt
+++ b/tests/classes/static_mix_2.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 You cannot overload a non static method with a static method
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/static_properties_001.phpt b/tests/classes/static_properties_001.phpt
index 1c34f68fc5..e14d87d7ab 100644
--- a/tests/classes/static_properties_001.phpt
+++ b/tests/classes/static_properties_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 Initializing static properties to arrays
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/this.phpt b/tests/classes/this.phpt
index 1d9c6236e4..5551e8ac88 100644
--- a/tests/classes/this.phpt
+++ b/tests/classes/this.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 $this cannot be exchanged
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/tostring_002.phpt b/tests/classes/tostring_002.phpt
index 8a4a7af339..eb1bea5447 100644
--- a/tests/classes/tostring_002.phpt
+++ b/tests/classes/tostring_002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 __toString() in __destruct
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/type_hinting_001.phpt b/tests/classes/type_hinting_001.phpt
index 28d1280b79..318dcbe086 100644
--- a/tests/classes/type_hinting_001.phpt
+++ b/tests/classes/type_hinting_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 class type hinting
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/type_hinting_002.phpt b/tests/classes/type_hinting_002.phpt
index 6fefcc8dd4..b65bc85c93 100644
--- a/tests/classes/type_hinting_002.phpt
+++ b/tests/classes/type_hinting_002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 class type hinting non existing class
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/visibility_000a.phpt b/tests/classes/visibility_000a.phpt
index 2524494ff8..0dd86aa182 100644
--- a/tests/classes/visibility_000a.phpt
+++ b/tests/classes/visibility_000a.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A redeclared method must have the same or higher visibility
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/visibility_000b.phpt b/tests/classes/visibility_000b.phpt
index 9305467323..f6ac466345 100644
--- a/tests/classes/visibility_000b.phpt
+++ b/tests/classes/visibility_000b.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A redeclared method must have the same or higher visibility
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/visibility_000c.phpt b/tests/classes/visibility_000c.phpt
index 064106e979..c651b05d75 100644
--- a/tests/classes/visibility_000c.phpt
+++ b/tests/classes/visibility_000c.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A redeclared method must have the same or higher visibility
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/visibility_001a.phpt b/tests/classes/visibility_001a.phpt
index ebd1cc34de..d749b5266a 100644
--- a/tests/classes/visibility_001a.phpt
+++ b/tests/classes/visibility_001a.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A redeclared method must have the same or higher visibility
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/visibility_001b.phpt b/tests/classes/visibility_001b.phpt
index e61078ede5..27c39cf430 100644
--- a/tests/classes/visibility_001b.phpt
+++ b/tests/classes/visibility_001b.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A redeclared method must have the same or higher visibility
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/visibility_001c.phpt b/tests/classes/visibility_001c.phpt
index bb1075aaed..a9a5896695 100644
--- a/tests/classes/visibility_001c.phpt
+++ b/tests/classes/visibility_001c.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A redeclared method must have the same or higher visibility
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/visibility_002a.phpt b/tests/classes/visibility_002a.phpt
index 6c88d204d2..ea86412cea 100644
--- a/tests/classes/visibility_002a.phpt
+++ b/tests/classes/visibility_002a.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A redeclared method must have the same or higher visibility
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/visibility_002b.phpt b/tests/classes/visibility_002b.phpt
index 71f47c3954..8116a3239b 100644
--- a/tests/classes/visibility_002b.phpt
+++ b/tests/classes/visibility_002b.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A redeclared method must have the same or higher visibility
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/visibility_002c.phpt b/tests/classes/visibility_002c.phpt
index 5edae1d068..308c9057db 100644
--- a/tests/classes/visibility_002c.phpt
+++ b/tests/classes/visibility_002c.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A redeclared method must have the same or higher visibility
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/visibility_003a.phpt b/tests/classes/visibility_003a.phpt
index 1693386f81..176cc4a906 100644
--- a/tests/classes/visibility_003a.phpt
+++ b/tests/classes/visibility_003a.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A redeclared method must have the same or higher visibility
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/visibility_003b.phpt b/tests/classes/visibility_003b.phpt
index fcfdbe3c55..9b45aa3487 100644
--- a/tests/classes/visibility_003b.phpt
+++ b/tests/classes/visibility_003b.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A redeclared method must have the same or higher visibility
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/visibility_003c.phpt b/tests/classes/visibility_003c.phpt
index d94a9c116b..27e2bc2bf5 100644
--- a/tests/classes/visibility_003c.phpt
+++ b/tests/classes/visibility_003c.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A redeclared method must have the same or higher visibility
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/visibility_004a.phpt b/tests/classes/visibility_004a.phpt
index 6f16a09edd..717f971999 100644
--- a/tests/classes/visibility_004a.phpt
+++ b/tests/classes/visibility_004a.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A redeclared method must have the same or higher visibility
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/visibility_004b.phpt b/tests/classes/visibility_004b.phpt
index 74a83185ee..1ede33450a 100644
--- a/tests/classes/visibility_004b.phpt
+++ b/tests/classes/visibility_004b.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A redeclared method must have the same or higher visibility
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/classes/visibility_004c.phpt b/tests/classes/visibility_004c.phpt
index 92a770374e..e4f94a3567 100644
--- a/tests/classes/visibility_004c.phpt
+++ b/tests/classes/visibility_004c.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 A redeclared method must have the same or higher visibility
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/lang/035.phpt b/tests/lang/035.phpt
index a5e3a7f4cc..63f0385e8c 100644
--- a/tests/lang/035.phpt
+++ b/tests/lang/035.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2: set_exception_handler()
---SKIPIF--
-<?php if (version_compare(zend_version(), "2.0.0-dev", "<")) print "skip Zend engine 2 required"; ?>
 --FILE--
 <?php
 class MyException extends Exception {
diff --git a/tests/lang/bug21961.phpt b/tests/lang/bug21961.phpt
index 9b7199208d..93e4374220 100644
--- a/tests/lang/bug21961.phpt
+++ b/tests/lang/bug21961.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #21961 (get_parent_class() segfault)
---SKIPIF--
-<?php if (version_compare(zend_version(),'2.0.0-dev','<')) die('skip prepared for ZE2'); ?>
 --FILE--
 <?php
 
diff --git a/tests/lang/bug7515.phpt b/tests/lang/bug7515.phpt
index ea58061db0..5c7756c6a1 100644
--- a/tests/lang/bug7515.phpt
+++ b/tests/lang/bug7515.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Bug #7515 (weird & invisible referencing of objects)
---SKIPIF--
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
 --INI--
 error_reporting=2039
 --FILE--
diff --git a/tests/lang/error_2_exception_001.phpt b/tests/lang/error_2_exception_001.phpt
index 9596ba2331..e084b92dd7 100644
--- a/tests/lang/error_2_exception_001.phpt
+++ b/tests/lang/error_2_exception_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 errors caught as exceptions
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/lang/type_hints_001.phpt b/tests/lang/type_hints_001.phpt
index e8a2ffa9e3..65f1dc398d 100644
--- a/tests/lang/type_hints_001.phpt
+++ b/tests/lang/type_hints_001.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 type hinting
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
diff --git a/tests/lang/type_hints_002.phpt b/tests/lang/type_hints_002.phpt
index b21240a792..bdd5b4e93e 100644
--- a/tests/lang/type_hints_002.phpt
+++ b/tests/lang/type_hints_002.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 type hinting
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class P { }
diff --git a/tests/lang/type_hints_003.phpt b/tests/lang/type_hints_003.phpt
index 2b536d0185..d2c48a3ad7 100644
--- a/tests/lang/type_hints_003.phpt
+++ b/tests/lang/type_hints_003.phpt
@@ -1,7 +1,5 @@
 --TEST--
 ZE2 type
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 class T {