diff --git a/tests/phpt/array/028_explode_error.php b/tests/phpt/array/028_explode_error.php
index d6e3f1e41b..3572e1509c 100644
--- a/tests/phpt/array/028_explode_error.php
+++ b/tests/phpt/array/028_explode_error.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /isset, !==, ===, is_array or similar function result may differ from PHP/
 /ExprNode explode\[\.\] at 028_explode_error\.php:7/
 <?php
diff --git a/tests/phpt/array/029_explode_error.php b/tests/phpt/array/029_explode_error.php
index 9fcefd57cb..994962aacf 100644
--- a/tests/phpt/array/029_explode_error.php
+++ b/tests/phpt/array/029_explode_error.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /isset, !==, ===, is_array or similar function result may differ from PHP/
 <?php
 
diff --git a/tests/phpt/array/031_explode_error.php b/tests/phpt/array/031_explode_error.php
index 4de2489f22..1e25cf03e7 100644
--- a/tests/phpt/array/031_explode_error.php
+++ b/tests/phpt/array/031_explode_error.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /isset, !==, ===, is_array or similar function result may differ from PHP/
 /ExprNode explode\[\.\] at 031_explode_error\.php:7/
 <?php
diff --git a/tests/phpt/array_access/002_set_append.php b/tests/phpt/array_access/002_set_append.php
index 7261b19333..9ecad6494d 100644
--- a/tests/phpt/array_access/002_set_append.php
+++ b/tests/phpt/array_access/002_set_append.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/array_access/003_as_array_access.php b/tests/phpt/array_access/003_as_array_access.php
index 4676556aa9..280873f4df 100644
--- a/tests/phpt/array_access/003_as_array_access.php
+++ b/tests/phpt/array_access/003_as_array_access.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/array_access/005_inheritance.php b/tests/phpt/array_access/005_inheritance.php
index d005ceaddc..4934499b80 100644
--- a/tests/phpt/array_access/005_inheritance.php
+++ b/tests/phpt/array_access/005_inheritance.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/array_access/007_assignment_chain.php b/tests/phpt/array_access/007_assignment_chain.php
index 313ef8ff76..a84f2d053a 100644
--- a/tests/phpt/array_access/007_assignment_chain.php
+++ b/tests/phpt/array_access/007_assignment_chain.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/array_access/008_isset_unset.php b/tests/phpt/array_access/008_isset_unset.php
index 9417206a74..4156990f04 100644
--- a/tests/phpt/array_access/008_isset_unset.php
+++ b/tests/phpt/array_access/008_isset_unset.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/array_access/009_empty.php b/tests/phpt/array_access/009_empty.php
index 6b03d68886..6647a5ddb5 100644
--- a/tests/phpt/array_access/009_empty.php
+++ b/tests/phpt/array_access/009_empty.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/by_name/01_by_name_construct.php b/tests/phpt/by_name/01_by_name_construct.php
index 0ddc0f2c32..d7dc5c5331 100644
--- a/tests/phpt/by_name/01_by_name_construct.php
+++ b/tests/phpt/by_name/01_by_name_construct.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 class NoCtor {
diff --git a/tests/phpt/by_name/02_by_name_call.php b/tests/phpt/by_name/02_by_name_call.php
index 17b77cf0b6..8cc2bd357b 100644
--- a/tests/phpt/by_name/02_by_name_call.php
+++ b/tests/phpt/by_name/02_by_name_call.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 class HasSomeFields {
diff --git a/tests/phpt/by_name/03_by_name_get_const.php b/tests/phpt/by_name/03_by_name_get_const.php
index 19528227ff..79a49026d1 100644
--- a/tests/phpt/by_name/03_by_name_get_const.php
+++ b/tests/phpt/by_name/03_by_name_get_const.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 class HasSomeFields {
diff --git a/tests/phpt/by_name/04_by_name_get_field.php b/tests/phpt/by_name/04_by_name_get_field.php
index f6fb0407aa..982ff7aaa5 100644
--- a/tests/phpt/by_name/04_by_name_get_field.php
+++ b/tests/phpt/by_name/04_by_name_get_field.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 class HasSomeFields {
diff --git a/tests/phpt/by_name/100_by_name_non_constexpr.php b/tests/phpt/by_name/100_by_name_non_constexpr.php
index 5914a51590..a9217ccfab 100644
--- a/tests/phpt/by_name/100_by_name_non_constexpr.php
+++ b/tests/phpt/by_name/100_by_name_non_constexpr.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /Syntax 'new \$class_name' works only if \$class_name is compile-time known/
 /Syntax '\$class_name::method\(\)' works only if \$class_name is compile-time known/
 /Syntax '\$class_name::CONST' works only if \$class_name is compile-time known/
diff --git a/tests/phpt/by_name/102_get_unresolved.php b/tests/phpt/by_name/102_get_unresolved.php
index 3232da1ce1..5e00f76102 100644
--- a/tests/phpt/by_name/102_get_unresolved.php
+++ b/tests/phpt/by_name/102_get_unresolved.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /Syntax 'new \$class_name' not resolved: __construct\(\) not found in I/
 /Syntax '\$class_name::method\(\)' not resolved: method unexistingSm not found in class A/
 /Syntax '\$class_name::method\(\)' works only for static methods, but A::im is an instance method/
diff --git a/tests/phpt/by_name/103_by_name_private_1.php b/tests/phpt/by_name/103_by_name_private_1.php
index 6596e8415d..e5fb29911e 100644
--- a/tests/phpt/by_name/103_by_name_private_1.php
+++ b/tests/phpt/by_name/103_by_name_private_1.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /Can't access private static field count/
 /Can't access private static method A::sm/
 /Can't access private method A::__construct/
diff --git a/tests/phpt/by_name/103_by_name_private_2.php b/tests/phpt/by_name/103_by_name_private_2.php
index 1f1e6edf47..8ac6bbed8d 100644
--- a/tests/phpt/by_name/103_by_name_private_2.php
+++ b/tests/phpt/by_name/103_by_name_private_2.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /Can't access private const A::ONE/
 <?php
 
diff --git a/tests/phpt/by_name/105_direct_by_name_call.php b/tests/phpt/by_name/105_direct_by_name_call.php
index 8dc4da5775..e645ea8978 100644
--- a/tests/phpt/by_name/105_direct_by_name_call.php
+++ b/tests/phpt/by_name/105_direct_by_name_call.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /Called internal function _by_name_call_method\(\)/
 /Called internal function _by_name_construct\(\)/
 <?php
diff --git a/tests/phpt/by_name/106_by_name_wrong_args.php b/tests/phpt/by_name/106_by_name_wrong_args.php
index 463803577c..4555d7905f 100644
--- a/tests/phpt/by_name/106_by_name_wrong_args.php
+++ b/tests/phpt/by_name/106_by_name_wrong_args.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /in callByName<A>/
 /\$class_name::sf\(\);/
 /Too few arguments in call to A::sf\(\), expected 1, have 0/
diff --git a/tests/phpt/by_name/107_by_name_wrong_tinf.php b/tests/phpt/by_name/107_by_name_wrong_tinf.php
index 9759be538a..650f883493 100644
--- a/tests/phpt/by_name/107_by_name_wrong_tinf.php
+++ b/tests/phpt/by_name/107_by_name_wrong_tinf.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 KPHP_SHOW_ALL_TYPE_ERRORS=1
 /in callByName<A>/
 /pass string to argument \$a of A::sf/
diff --git a/tests/phpt/cl/001_base_class.php b/tests/phpt/cl/001_base_class.php
index 092107f95e..3ea87267b5 100644
--- a/tests/phpt/cl/001_base_class.php
+++ b/tests/phpt/cl/001_base_class.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/cl/002_use.php b/tests/phpt/cl/002_use.php
index 22947c0d09..54773442fe 100644
--- a/tests/phpt/cl/002_use.php
+++ b/tests/phpt/cl/002_use.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 use Classes\Common;
diff --git a/tests/phpt/cl/003_class_in_class.php b/tests/phpt/cl/003_class_in_class.php
index ee73a2bb54..733d4e4fb9 100644
--- a/tests/phpt/cl/003_class_in_class.php
+++ b/tests/phpt/cl/003_class_in_class.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/cl/005_cast_to_array_debug.php b/tests/phpt/cl/005_cast_to_array_debug.php
index 93c0cc068a..f3c66a5b9c 100644
--- a/tests/phpt/cl/005_cast_to_array_debug.php
+++ b/tests/phpt/cl/005_cast_to_array_debug.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/cl/006_interface_cast_to_array.php b/tests/phpt/cl/006_interface_cast_to_array.php
index 7f57d0dd5d..c07ecbaaa3 100644
--- a/tests/phpt/cl/006_interface_cast_to_array.php
+++ b/tests/phpt/cl/006_interface_cast_to_array.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/cl/007_to_array_debug_with_extends.php b/tests/phpt/cl/007_to_array_debug_with_extends.php
index ae568146cf..69ae55cf57 100644
--- a/tests/phpt/cl/007_to_array_debug_with_extends.php
+++ b/tests/phpt/cl/007_to_array_debug_with_extends.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/cl/008_fields_default_value.php b/tests/phpt/cl/008_fields_default_value.php
index 2cb3cb5ec3..877bda2595 100644
--- a/tests/phpt/cl/008_fields_default_value.php
+++ b/tests/phpt/cl/008_fields_default_value.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/cl/009_to_array_debug_with_class_names.php b/tests/phpt/cl/009_to_array_debug_with_class_names.php
index 06276f9cfd..99c636eeec 100644
--- a/tests/phpt/cl/009_to_array_debug_with_class_names.php
+++ b/tests/phpt/cl/009_to_array_debug_with_class_names.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/cl/027_ternary_operator_assumptions.php b/tests/phpt/cl/027_ternary_operator_assumptions.php
index 4a4587153b..2dfb2a410f 100644
--- a/tests/phpt/cl/027_ternary_operator_assumptions.php
+++ b/tests/phpt/cl/027_ternary_operator_assumptions.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 interface AI {
diff --git a/tests/phpt/cl/030_resolve_from_phpdoc.php b/tests/phpt/cl/030_resolve_from_phpdoc.php
index 20ee3d1936..5b604b0544 100644
--- a/tests/phpt/cl/030_resolve_from_phpdoc.php
+++ b/tests/phpt/cl/030_resolve_from_phpdoc.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/cl/111_Memcache.php b/tests/phpt/cl/111_Memcache.php
index d3820dcfed..5d6be4ba51 100644
--- a/tests/phpt/cl/111_Memcache.php
+++ b/tests/phpt/cl/111_Memcache.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/cl/116_wa_serialize.php b/tests/phpt/cl/116_wa_serialize.php
index 156ae19805..5e7b1fd731 100644
--- a/tests/phpt/cl/116_wa_serialize.php
+++ b/tests/phpt/cl/116_wa_serialize.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/cl/128_prop_of_same_class.php b/tests/phpt/cl/128_prop_of_same_class.php
index 30e817ff79..ec510cb5fe 100644
--- a/tests/phpt/cl/128_prop_of_same_class.php
+++ b/tests/phpt/cl/128_prop_of_same_class.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/cl/139_class_inside_fork.php b/tests/phpt/cl/139_class_inside_fork.php
index e12f67a8d9..d292fb0cc8 100644
--- a/tests/phpt/cl/139_class_inside_fork.php
+++ b/tests/phpt/cl/139_class_inside_fork.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 #ifndef KPHP
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/cl/140_class_from_fork.php b/tests/phpt/cl/140_class_from_fork.php
index 68e450a41f..1957b76992 100644
--- a/tests/phpt/cl/140_class_from_fork.php
+++ b/tests/phpt/cl/140_class_from_fork.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 #ifndef KPHP
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/cl/198_concatenation.php b/tests/phpt/cl/198_concatenation.php
index 66f44b25e2..780825ddbd 100644
--- a/tests/phpt/cl/198_concatenation.php
+++ b/tests/phpt/cl/198_concatenation.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/class_inheritance/010_to_array_debug.php b/tests/phpt/class_inheritance/010_to_array_debug.php
index de4d6b362d..04bbb95c1c 100644
--- a/tests/phpt/class_inheritance/010_to_array_debug.php
+++ b/tests/phpt/class_inheritance/010_to_array_debug.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 require_once '008_two_level_inheritance.php';
diff --git a/tests/phpt/class_inheritance/022_ref_cnt.php b/tests/phpt/class_inheritance/022_ref_cnt.php
index cba8cf82c8..e68b86418f 100644
--- a/tests/phpt/class_inheritance/022_ref_cnt.php
+++ b/tests/phpt/class_inheritance/022_ref_cnt.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 #ifndef KPHP
diff --git a/tests/phpt/clone_keyword/004_just_has_clone_method_with_exception_but_never_use_it.php b/tests/phpt/clone_keyword/004_just_has_clone_method_with_exception_but_never_use_it.php
index bc85788d7a..10de1d9a1f 100644
--- a/tests/phpt/clone_keyword/004_just_has_clone_method_with_exception_but_never_use_it.php
+++ b/tests/phpt/clone_keyword/004_just_has_clone_method_with_exception_but_never_use_it.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 class A {
     public function __clone() {
diff --git a/tests/phpt/clone_keyword/006_reference_count.php b/tests/phpt/clone_keyword/006_reference_count.php
index 13ed3ab791..de40e94d2e 100644
--- a/tests/phpt/clone_keyword/006_reference_count.php
+++ b/tests/phpt/clone_keyword/006_reference_count.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 #ifndef KPHP
diff --git a/tests/phpt/clone_keyword/007_clone_interfaces.php b/tests/phpt/clone_keyword/007_clone_interfaces.php
index 08956970fe..918b85ab5f 100644
--- a/tests/phpt/clone_keyword/007_clone_interfaces.php
+++ b/tests/phpt/clone_keyword/007_clone_interfaces.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 #ifndef KPHP
diff --git a/tests/phpt/colors/015_colored_resumable.php b/tests/phpt/colors/015_colored_resumable.php
index b4214d008f..c68263d542 100644
--- a/tests/phpt/colors/015_colored_resumable.php
+++ b/tests/phpt/colors/015_colored_resumable.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/colors/016_colored_resumable_2.php b/tests/phpt/colors/016_colored_resumable_2.php
index 012f34801c..68f44e79d3 100644
--- a/tests/phpt/colors/016_colored_resumable_2.php
+++ b/tests/phpt/colors/016_colored_resumable_2.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /curl from api/
 /api@api -> resum -> resum2 -> callurl@has-curl/
 <?php
diff --git a/tests/phpt/declare/01_strict_types.php b/tests/phpt/declare/01_strict_types.php
index 1b1156bb04..786716a6c1 100644
--- a/tests/phpt/declare/01_strict_types.php
+++ b/tests/phpt/declare/01_strict_types.php
@@ -1,3 +1,3 @@
-@ok k2_skip
+@ok
 <?php
 require_once __FILE__ . '.inc';
diff --git a/tests/phpt/declare/02_strict_types2.php b/tests/phpt/declare/02_strict_types2.php
index 1b1156bb04..786716a6c1 100644
--- a/tests/phpt/declare/02_strict_types2.php
+++ b/tests/phpt/declare/02_strict_types2.php
@@ -1,3 +1,3 @@
-@ok k2_skip
+@ok
 <?php
 require_once __FILE__ . '.inc';
diff --git a/tests/phpt/declare/03_strict_types_error.php b/tests/phpt/declare/03_strict_types_error.php
index e756ae52f8..53f90cd53c 100644
--- a/tests/phpt/declare/03_strict_types_error.php
+++ b/tests/phpt/declare/03_strict_types_error.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 KPHP_SHOW_ALL_TYPE_ERRORS=1
 /pass int to argument \$str1 of strcmp/
 /but it's declared as @param string/
diff --git a/tests/phpt/declare/09_strict_types_not_enabled.php b/tests/phpt/declare/09_strict_types_not_enabled.php
index 1b1156bb04..786716a6c1 100644
--- a/tests/phpt/declare/09_strict_types_not_enabled.php
+++ b/tests/phpt/declare/09_strict_types_not_enabled.php
@@ -1,3 +1,3 @@
-@ok k2_skip
+@ok
 <?php
 require_once __FILE__ . '.inc';
diff --git a/tests/phpt/dl/1005_op_pow.php b/tests/phpt/dl/1005_op_pow.php
index 9ec6d94a43..ea1f39aa00 100644
--- a/tests/phpt/dl/1005_op_pow.php
+++ b/tests/phpt/dl/1005_op_pow.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 define ('TWO', 2);
diff --git a/tests/phpt/dl/1008_fail_class_instance_with_index_key.php b/tests/phpt/dl/1008_fail_class_instance_with_index_key.php
index 196df1e891..9eae059204 100644
--- a/tests/phpt/dl/1008_fail_class_instance_with_index_key.php
+++ b/tests/phpt/dl/1008_fail_class_instance_with_index_key.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 <?php
 class A { 
     public $x = 20; 
diff --git a/tests/phpt/dl/1023_short_list_assignment.php b/tests/phpt/dl/1023_short_list_assignment.php
index 53612cb5cd..95a3fd6756 100644
--- a/tests/phpt/dl/1023_short_list_assignment.php
+++ b/tests/phpt/dl/1023_short_list_assignment.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/dl/1025_sprintf_dollar_sign.php b/tests/phpt/dl/1025_sprintf_dollar_sign.php
index 0402fdbc83..13e7b92d26 100644
--- a/tests/phpt/dl/1025_sprintf_dollar_sign.php
+++ b/tests/phpt/dl/1025_sprintf_dollar_sign.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 $num = 10;
diff --git a/tests/phpt/dl/1026_hrtime.php b/tests/phpt/dl/1026_hrtime.php
index 8d56525a03..4b0b32c536 100644
--- a/tests/phpt/dl/1026_hrtime.php
+++ b/tests/phpt/dl/1026_hrtime.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 // We can't test the exact values, but we can try to
diff --git a/tests/phpt/dl/1028_math_constants.php b/tests/phpt/dl/1028_math_constants.php
index 9b0b92f6a5..dd217d1f89 100644
--- a/tests/phpt/dl/1028_math_constants.php
+++ b/tests/phpt/dl/1028_math_constants.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 function test_math_constants() {
diff --git a/tests/phpt/dl/1035_to_array_debug_tuple.php b/tests/phpt/dl/1035_to_array_debug_tuple.php
index 2e16cdb121..666c994b11 100644
--- a/tests/phpt/dl/1035_to_array_debug_tuple.php
+++ b/tests/phpt/dl/1035_to_array_debug_tuple.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/dl/1040_nohint_always_throw.php b/tests/phpt/dl/1040_nohint_always_throw.php
index 9979df5ecc..684ad49393 100644
--- a/tests/phpt/dl/1040_nohint_always_throw.php
+++ b/tests/phpt/dl/1040_nohint_always_throw.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /\$i = getInt\(2\);/
 /Using result of void function getInt/
 /echo \$i, "\\n ";/
diff --git a/tests/phpt/dl/386_random_int.php b/tests/phpt/dl/386_random_int.php
index cac64bf783..0a038db88a 100644
--- a/tests/phpt/dl/386_random_int.php
+++ b/tests/phpt/dl/386_random_int.php
@@ -1,4 +1,4 @@
-@ok php8 k2_skip
+@ok php8
 <?php
 
 function test_random_int() {
diff --git a/tests/phpt/dl/389_regexp.php b/tests/phpt/dl/389_regexp.php
index 986c077c1f..8fefbc4d8c 100644
--- a/tests/phpt/dl/389_regexp.php
+++ b/tests/phpt/dl/389_regexp.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
   var_dump (preg_match ('/\s/', json_decode ('"\u00a0"')));
   var_dump (preg_match ('/\s/u', json_decode ('"\u00a0"')));
diff --git a/tests/phpt/dl/390_int_to_string.php b/tests/phpt/dl/390_int_to_string.php
index 4ce7980735..fa0b0b080e 100644
--- a/tests/phpt/dl/390_int_to_string.php
+++ b/tests/phpt/dl/390_int_to_string.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 $ints = [
diff --git a/tests/phpt/dl/392_int64_indexing.php b/tests/phpt/dl/392_int64_indexing.php
index 2ec86b7c9d..40d66692df 100644
--- a/tests/phpt/dl/392_int64_indexing.php
+++ b/tests/phpt/dl/392_int64_indexing.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 function test_array_int64_indexing() {
diff --git a/tests/phpt/dl/417_unset.php b/tests/phpt/dl/417_unset.php
index f4be9a5304..bc9f5359a8 100644
--- a/tests/phpt/dl/417_unset.php
+++ b/tests/phpt/dl/417_unset.php
@@ -1,4 +1,4 @@
-@ok benchmark k2_skip
+@ok benchmark
 <?php
   $start = 1;
   $finish = 350000;
diff --git a/tests/phpt/dl/430_htmlentities.php b/tests/phpt/dl/430_htmlentities.php
index 14b6f90789..fe3bb64b75 100644
--- a/tests/phpt/dl/430_htmlentities.php
+++ b/tests/phpt/dl/430_htmlentities.php
@@ -1,4 +1,4 @@
-@ok benchmark k2_skip
+@ok benchmark
 <?php
   for ($i = 32; $i < 128; $i++)
     $s .= chr ($i);
diff --git a/tests/phpt/dl/433_nl2br.php b/tests/phpt/dl/433_nl2br.php
index afafe30ec8..9b4a82db26 100644
--- a/tests/phpt/dl/433_nl2br.php
+++ b/tests/phpt/dl/433_nl2br.php
@@ -1,4 +1,4 @@
-@ok benchmark k2_skip
+@ok benchmark
 <?php
   $s = "This\r\nis\n\ra\nstring\radasdasdasdasdasdasjgjhsdgf4 6r34 t5 t54 t 54g 4g54 t 54 t 54 t 54  5534344r 34f34 f34fg 34tg35t5 t5tjsdgfhasdgasdgfjhgryt4512f14t4g5r3465f675s67f5sd675fas685gf78gb6df79sb6sdg96hsdg796hg6hfg876hfg7h6fg78h6fg78h6fg78h6fg78h6gf786hfg786hfg7h6fg786hg78h67h6fg786\n";
   $s = str_repeat ("\r\r", 100);
diff --git a/tests/phpt/dl/440_str_replace_char.php b/tests/phpt/dl/440_str_replace_char.php
index 0f068499c2..b06705004d 100644
--- a/tests/phpt/dl/440_str_replace_char.php
+++ b/tests/phpt/dl/440_str_replace_char.php
@@ -1,4 +1,4 @@
-@ok benchmark k2_skip
+@ok benchmark
 <?php
 
 for ($i = 0; $i < 1000; $i++) {
diff --git a/tests/phpt/dl/443_vector.php b/tests/phpt/dl/443_vector.php
index 637d2af188..749b055f2e 100644
--- a/tests/phpt/dl/443_vector.php
+++ b/tests/phpt/dl/443_vector.php
@@ -1,4 +1,4 @@
-@ok benchmark k2_skip
+@ok benchmark
 <?php
   $a = array();
   for ($i = 0; $i < 250000; $i++) {
diff --git a/tests/phpt/dl/445_divide.php b/tests/phpt/dl/445_divide.php
index 8853cd6a3a..959b430890 100644
--- a/tests/phpt/dl/445_divide.php
+++ b/tests/phpt/dl/445_divide.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
   $is_kphp = true;
 #ifndef KPHP
diff --git a/tests/phpt/dl/460_OrFalse.php b/tests/phpt/dl/460_OrFalse.php
index 418b699c6b..d43be8cf74 100644
--- a/tests/phpt/dl/460_OrFalse.php
+++ b/tests/phpt/dl/460_OrFalse.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
   fwrite (STDERR, "begin\n");
   $x = "asdasd";
diff --git a/tests/phpt/dl/462_foreach.php b/tests/phpt/dl/462_foreach.php
index e1b89fd2ce..679d5dc6b1 100644
--- a/tests/phpt/dl/462_foreach.php
+++ b/tests/phpt/dl/462_foreach.php
@@ -1,4 +1,4 @@
-@ok benchmark k2_skip
+@ok benchmark
 <?php
   function hash2($n) {
     for ($i = 0; $i < $n; $i++) {
diff --git a/tests/phpt/dl/465_pack64bit.php b/tests/phpt/dl/465_pack64bit.php
index 2896c98ef0..bba579a493 100644
--- a/tests/phpt/dl/465_pack64bit.php
+++ b/tests/phpt/dl/465_pack64bit.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 $p1 = unpack("P3", pack ('P*', 123, '8589934592', PHP_INT_MAX));
diff --git a/tests/phpt/dl/468_convertToXML.php b/tests/phpt/dl/468_convertToXML.php
index 6e7fd4811f..559d41d190 100644
--- a/tests/phpt/dl/468_convertToXML.php
+++ b/tests/phpt/dl/468_convertToXML.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 function isVector($array, $force_array = false) {
diff --git a/tests/phpt/dl/470_fasta.php b/tests/phpt/dl/470_fasta.php
index 9a0d99186a..fd03368e1e 100644
--- a/tests/phpt/dl/470_fasta.php
+++ b/tests/phpt/dl/470_fasta.php
@@ -1,4 +1,4 @@
-@ok benchmark k2_skip
+@ok benchmark
 <?php
 /* The Computer Language Benchmarks Game
    http://shootout.alioth.debian.org/
diff --git a/tests/phpt/dl/471_pfannkuchen.php b/tests/phpt/dl/471_pfannkuchen.php
index 1b96161795..1f6603053f 100644
--- a/tests/phpt/dl/471_pfannkuchen.php
+++ b/tests/phpt/dl/471_pfannkuchen.php
@@ -1,4 +1,4 @@
-@ok benchmark k2_skip
+@ok benchmark
 <? /* The Computer Language Benchmarks Game
    http://shootout.alioth.debian.org/
    
diff --git a/tests/phpt/dl/481_parse_str.php b/tests/phpt/dl/481_parse_str.php
index 3edc994256..30c1fd5911 100644
--- a/tests/phpt/dl/481_parse_str.php
+++ b/tests/phpt/dl/481_parse_str.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
   $array = array (array ('bar[' => array()), 'foo', array ('bar[' => array()), array ('bar[' => array()));
   $query = http_build_query ($array);
diff --git a/tests/phpt/dl/485_str_pad.php b/tests/phpt/dl/485_str_pad.php
index 9c67b03de9..7ac6707bd4 100644
--- a/tests/phpt/dl/485_str_pad.php
+++ b/tests/phpt/dl/485_str_pad.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 $input = "Alien";
 echo str_pad($input, 10);                      // выводит "Alien     "
diff --git a/tests/phpt/dl/503_strrchr.php b/tests/phpt/dl/503_strrchr.php
index be96eb0154..339636a1a5 100644
--- a/tests/phpt/dl/503_strrchr.php
+++ b/tests/phpt/dl/503_strrchr.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 function test_empty_strings() {
diff --git a/tests/phpt/dl/948_hashmap.php b/tests/phpt/dl/948_hashmap.php
index ce96b58cdb..5cc0220490 100644
--- a/tests/phpt/dl/948_hashmap.php
+++ b/tests/phpt/dl/948_hashmap.php
@@ -1,4 +1,4 @@
-@ok benchmar k2_skip
+@ok benchmark
 <?php
 
 function test_base_str ($keys, $n) {
diff --git a/tests/phpt/dl/949.php b/tests/phpt/dl/949.php
index 9b4980a34d..c3e481063b 100644
--- a/tests/phpt/dl/949.php
+++ b/tests/phpt/dl/949.php
@@ -1,4 +1,4 @@
-@ok benchmark k2_skip
+@ok benchmark
 <?php
 
 function my_throw ($msg, $code) {
diff --git a/tests/phpt/dl/951_infer.php b/tests/phpt/dl/951_infer.php
index 249261b331..49d6270139 100644
--- a/tests/phpt/dl/951_infer.php
+++ b/tests/phpt/dl/951_infer.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 define ('A', 1);
 define ('B', A + 1);
diff --git a/tests/phpt/dl/952_cfg_uninited.php b/tests/phpt/dl/952_cfg_uninited.php
index b80976bc8b..bd3f657173 100644
--- a/tests/phpt/dl/952_cfg_uninited.php
+++ b/tests/phpt/dl/952_cfg_uninited.php
@@ -1,4 +1,4 @@
-@kphp_should_warn k2_skip
+@kphp_should_warn
 /Variable \$a1 may be used uninitialized/
 /Variable \$a2 may be used uninitialized/
 /Variable \$b2 may be used uninitialized/
diff --git a/tests/phpt/dl/956_dna_regex.php b/tests/phpt/dl/956_dna_regex.php
index e9dcef69d8..4961e004ba 100644
--- a/tests/phpt/dl/956_dna_regex.php
+++ b/tests/phpt/dl/956_dna_regex.php
@@ -1,4 +1,4 @@
-@ok benchmark_but_too_long k2_skip
+@ok benchmark_but_too_long
 <?php
 #
 # The Computer Language Shootout
diff --git a/tests/phpt/dl/957_concat.php b/tests/phpt/dl/957_concat.php
index 38eb38c915..e29f714ff9 100644
--- a/tests/phpt/dl/957_concat.php
+++ b/tests/phpt/dl/957_concat.php
@@ -1,4 +1,4 @@
-@ok benchmark k2_skip
+@ok benchmark
 <?php
 $max = 127000000;
 $result = "";
diff --git a/tests/phpt/dl/959_default_args.php b/tests/phpt/dl/959_default_args.php
index 5f9a6e7693..56516f6f11 100644
--- a/tests/phpt/dl/959_default_args.php
+++ b/tests/phpt/dl/959_default_args.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 
diff --git a/tests/phpt/dl/960_push_back.php b/tests/phpt/dl/960_push_back.php
index 0b921033c2..202855259f 100644
--- a/tests/phpt/dl/960_push_back.php
+++ b/tests/phpt/dl/960_push_back.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 
diff --git a/tests/phpt/dl/961_const_data.php b/tests/phpt/dl/961_const_data.php
index 8df9055fcc..339c19f10a 100644
--- a/tests/phpt/dl/961_const_data.php
+++ b/tests/phpt/dl/961_const_data.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 $a = "";
 print $a."\n";
diff --git a/tests/phpt/dl/964_try.php b/tests/phpt/dl/964_try.php
index dc7fd528e6..8e7631a6e2 100644
--- a/tests/phpt/dl/964_try.php
+++ b/tests/phpt/dl/964_try.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 /**
  * @param string $desc
diff --git a/tests/phpt/dl/965_bin_func.php b/tests/phpt/dl/965_bin_func.php
index daad4bb722..e57907bcf9 100644
--- a/tests/phpt/dl/965_bin_func.php
+++ b/tests/phpt/dl/965_bin_func.php
@@ -1,5 +1,5 @@
-@ok k2_skip
-<?
+@ok
+<?php
 var_dump (+1);
 var_dump (1 === 1);
 var_dump (1 === '1');
diff --git a/tests/phpt/dl/970_line.php b/tests/phpt/dl/970_line.php
index 8d462bac64..4ebba37f0e 100644
--- a/tests/phpt/dl/970_line.php
+++ b/tests/phpt/dl/970_line.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
   function xxx () {
diff --git a/tests/phpt/dl/974_callback.php b/tests/phpt/dl/974_callback.php
index bf8d265b21..a2b3f8f6ac 100644
--- a/tests/phpt/dl/974_callback.php
+++ b/tests/phpt/dl/974_callback.php
@@ -1,4 +1,4 @@
-@ok callback k2_skip
+@ok callback
 <?php
 
 /**
diff --git a/tests/phpt/dl/975_bug.php b/tests/phpt/dl/975_bug.php
index b29d8114e4..713ef6299b 100644
--- a/tests/phpt/dl/975_bug.php
+++ b/tests/phpt/dl/975_bug.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 echo 3.7;
 echo 2 . 3.7;
diff --git a/tests/phpt/dl/980_push.php b/tests/phpt/dl/980_push.php
index b2614c2231..718dd18c89 100644
--- a/tests/phpt/dl/980_push.php
+++ b/tests/phpt/dl/980_push.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 $scalar_array = array (
diff --git a/tests/phpt/dl/981_chr.php b/tests/phpt/dl/981_chr.php
index f1809c3b6d..f0496077b0 100644
--- a/tests/phpt/dl/981_chr.php
+++ b/tests/phpt/dl/981_chr.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
   for ($i = -300; $i <= 300; $i++) {
     if ($i) {
diff --git a/tests/phpt/dl/switch/03_string.php b/tests/phpt/dl/switch/03_string.php
index 0cb968967c..74fb8b0032 100644
--- a/tests/phpt/dl/switch/03_string.php
+++ b/tests/phpt/dl/switch/03_string.php
@@ -1,5 +1,5 @@
-@benchmark ok k2_skip
-<?
+@benchmark ok
+<?php
 ob_start();
 function f($s) {
   switch ($s) {
diff --git a/tests/phpt/errors/005_sort_tuple_array.php b/tests/phpt/errors/005_sort_tuple_array.php
index 16d94ccd73..0dde3f1d6f 100644
--- a/tests/phpt/errors/005_sort_tuple_array.php
+++ b/tests/phpt/errors/005_sort_tuple_array.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /tuple\(int, int\) is not comparable and cannot be sorted/
 /shape\(x:int\) is not comparable and cannot be sorted/
 /C is not comparable and cannot be sorted/
diff --git a/tests/phpt/exceptions/12_throwable_methods.php b/tests/phpt/exceptions/12_throwable_methods.php
index ed819dc216..2a0608601e 100644
--- a/tests/phpt/exceptions/12_throwable_methods.php
+++ b/tests/phpt/exceptions/12_throwable_methods.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 function test() {
diff --git a/tests/phpt/fork/005_fork_primitives.php b/tests/phpt/fork/005_fork_primitives.php
index 6bb522e98c..8c5130239e 100644
--- a/tests/phpt/fork/005_fork_primitives.php
+++ b/tests/phpt/fork/005_fork_primitives.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/fork/009_fork_void.php b/tests/phpt/fork/009_fork_void.php
index 835e3167a8..5bed5fb6fc 100644
--- a/tests/phpt/fork/009_fork_void.php
+++ b/tests/phpt/fork/009_fork_void.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /forking void functions is forbidden, return null at least/
 <?php
 
diff --git a/tests/phpt/fork/010_wait.php b/tests/phpt/fork/010_wait.php
index ff916f8932..2e29888b57 100644
--- a/tests/phpt/fork/010_wait.php
+++ b/tests/phpt/fork/010_wait.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/fork/011_queue.php b/tests/phpt/fork/011_queue.php
index 153e0fa6fa..2f76b5135e 100644
--- a/tests/phpt/fork/011_queue.php
+++ b/tests/phpt/fork/011_queue.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/fork/014_wait_global.php b/tests/phpt/fork/014_wait_global.php
index 3756f3f411..e2c6bd634e 100644
--- a/tests/phpt/fork/014_wait_global.php
+++ b/tests/phpt/fork/014_wait_global.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/fork/015_save_to_instance_prop.php b/tests/phpt/fork/015_save_to_instance_prop.php
index deb6013f4a..6bab3cdfb8 100644
--- a/tests/phpt/fork/015_save_to_instance_prop.php
+++ b/tests/phpt/fork/015_save_to_instance_prop.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/fork/019_ternary_operator_in_resumable_expr.php b/tests/phpt/fork/019_ternary_operator_in_resumable_expr.php
index a98a702661..2a44335677 100644
--- a/tests/phpt/fork/019_ternary_operator_in_resumable_expr.php
+++ b/tests/phpt/fork/019_ternary_operator_in_resumable_expr.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/fork/020_logical_operators_in_resumable_expr.php b/tests/phpt/fork/020_logical_operators_in_resumable_expr.php
index d2b5ff7c34..6f6aedba0d 100644
--- a/tests/phpt/fork/020_logical_operators_in_resumable_expr.php
+++ b/tests/phpt/fork/020_logical_operators_in_resumable_expr.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/fork/021_null_coalesce_in_resumable_expr.php b/tests/phpt/fork/021_null_coalesce_in_resumable_expr.php
index 22aeb717d0..1b661eb36b 100644
--- a/tests/phpt/fork/021_null_coalesce_in_resumable_expr.php
+++ b/tests/phpt/fork/021_null_coalesce_in_resumable_expr.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/fork/023_op_set_in_resumable_expr.php b/tests/phpt/fork/023_op_set_in_resumable_expr.php
index 2fc39076b1..e41dc95d54 100644
--- a/tests/phpt/fork/023_op_set_in_resumable_expr.php
+++ b/tests/phpt/fork/023_op_set_in_resumable_expr.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/fork/031_ok_pass_fork_unreachable_resumable_lambda_to_builtin_function.php b/tests/phpt/fork/031_ok_pass_fork_unreachable_resumable_lambda_to_builtin_function.php
index 64c5a48c63..d536bbcac0 100644
--- a/tests/phpt/fork/031_ok_pass_fork_unreachable_resumable_lambda_to_builtin_function.php
+++ b/tests/phpt/fork/031_ok_pass_fork_unreachable_resumable_lambda_to_builtin_function.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/generics/017_templates_primitives.php b/tests/phpt/generics/017_templates_primitives.php
index f1f158b96f..f2197f4872 100644
--- a/tests/phpt/generics/017_templates_primitives.php
+++ b/tests/phpt/generics/017_templates_primitives.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/generics/019_templates_and_lambdas.php b/tests/phpt/generics/019_templates_and_lambdas.php
index f79ca2d179..eb611d0b34 100644
--- a/tests/phpt/generics/019_templates_and_lambdas.php
+++ b/tests/phpt/generics/019_templates_and_lambdas.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/generics/024_wrappers_for_json.php b/tests/phpt/generics/024_wrappers_for_json.php
index c7e8704316..3685176390 100644
--- a/tests/phpt/generics/024_wrappers_for_json.php
+++ b/tests/phpt/generics/024_wrappers_for_json.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/generics/026_variadic_generics.php b/tests/phpt/generics/026_variadic_generics.php
index 7d82b6780c..25cbb30f6c 100644
--- a/tests/phpt/generics/026_variadic_generics.php
+++ b/tests/phpt/generics/026_variadic_generics.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 interface MyStringable { function __toString(); }
diff --git a/tests/phpt/generics/027_constexpr_switch.php b/tests/phpt/generics/027_constexpr_switch.php
index 446ec963cc..53be0c11ac 100644
--- a/tests/phpt/generics/027_constexpr_switch.php
+++ b/tests/phpt/generics/027_constexpr_switch.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/generics/028_constexpr_services_cont.php b/tests/phpt/generics/028_constexpr_services_cont.php
index be866840c4..7cbb697156 100644
--- a/tests/phpt/generics/028_constexpr_services_cont.php
+++ b/tests/phpt/generics/028_constexpr_services_cont.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 class ServicesContainer {
diff --git a/tests/phpt/header_register_callback/throw_error_1.php b/tests/phpt/header_register_callback/throw_error_1.php
index 0e4496d46b..e899f825f8 100644
--- a/tests/phpt/header_register_callback/throw_error_1.php
+++ b/tests/phpt/header_register_callback/throw_error_1.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /header_register_callback should not throw exceptions/
 <?php
 
diff --git a/tests/phpt/header_register_callback/throw_error_2.php b/tests/phpt/header_register_callback/throw_error_2.php
index c384ebade8..7b951d0bb2 100644
--- a/tests/phpt/header_register_callback/throw_error_2.php
+++ b/tests/phpt/header_register_callback/throw_error_2.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /header_register_callback should not throw exceptions/
 <?php
 
diff --git a/tests/phpt/header_register_callback/throw_error_3.php b/tests/phpt/header_register_callback/throw_error_3.php
index 3db6f39083..9b86e3ca89 100644
--- a/tests/phpt/header_register_callback/throw_error_3.php
+++ b/tests/phpt/header_register_callback/throw_error_3.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /header_register_callback should not throw exceptions/
 <?php
 
diff --git a/tests/phpt/instance_cache/10_instance_cache_abstract_error.php b/tests/phpt/instance_cache/10_instance_cache_abstract_error.php
index d8158d5a00..6358319a32 100644
--- a/tests/phpt/instance_cache/10_instance_cache_abstract_error.php
+++ b/tests/phpt/instance_cache/10_instance_cache_abstract_error.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /Can not store polymorphic type AbstractClass with mutable derived class ConcreteB/
 <?php
 
diff --git a/tests/phpt/instance_cache/12_instance_cache_polymprphic_field_error.php b/tests/phpt/instance_cache/12_instance_cache_polymprphic_field_error.php
index 0847646adb..60399c7442 100644
--- a/tests/phpt/instance_cache/12_instance_cache_polymprphic_field_error.php
+++ b/tests/phpt/instance_cache/12_instance_cache_polymprphic_field_error.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /Can not store instance of non-serializable class Y with instance_cache_store call/
 <?php
 
diff --git a/tests/phpt/instance_cache/2_instance_cache_mutable_store_error.php b/tests/phpt/instance_cache/2_instance_cache_mutable_store_error.php
index fea8ccf154..af5a6774e9 100644
--- a/tests/phpt/instance_cache/2_instance_cache_mutable_store_error.php
+++ b/tests/phpt/instance_cache/2_instance_cache_mutable_store_error.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /Can not store instance of mutable class X with instance_cache_store call/
 <?php
 
diff --git a/tests/phpt/instance_cache/3_instance_cache_mutable_fetch_error.php b/tests/phpt/instance_cache/3_instance_cache_mutable_fetch_error.php
index 0643b206cc..5269bffd38 100644
--- a/tests/phpt/instance_cache/3_instance_cache_mutable_fetch_error.php
+++ b/tests/phpt/instance_cache/3_instance_cache_mutable_fetch_error.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /Can not fetch instance of mutable class X with instance_cache_fetch call/
 <?php
 
diff --git a/tests/phpt/instance_cache/4_instance_cache_non_instance_error.php b/tests/phpt/instance_cache/4_instance_cache_non_instance_error.php
index d9e289fdae..1dd6583e42 100644
--- a/tests/phpt/instance_cache/4_instance_cache_non_instance_error.php
+++ b/tests/phpt/instance_cache/4_instance_cache_non_instance_error.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /pass int\[]\ to argument \$value of instance_cache_store/
 <?php
 
diff --git a/tests/phpt/instance_cache/5_instance_cache_polymorphic_simple.php b/tests/phpt/instance_cache/5_instance_cache_polymorphic_simple.php
index 3ce70b965b..a92a678791 100644
--- a/tests/phpt/instance_cache/5_instance_cache_polymorphic_simple.php
+++ b/tests/phpt/instance_cache/5_instance_cache_polymorphic_simple.php
@@ -1,4 +1,4 @@
-@ok non-idempotent k2_skip
+@ok non-idempotent
 <?php
 
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/instance_cache/6_instance_cache_polymorphic_error.php b/tests/phpt/instance_cache/6_instance_cache_polymorphic_error.php
index 248f47c0ce..49bd645ff1 100644
--- a/tests/phpt/instance_cache/6_instance_cache_polymorphic_error.php
+++ b/tests/phpt/instance_cache/6_instance_cache_polymorphic_error.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /Can not store polymorphic type A with mutable derived class D/
 <?php
 
diff --git a/tests/phpt/instance_cache/8_instance_cache_interface_error.php b/tests/phpt/instance_cache/8_instance_cache_interface_error.php
index 2d3aeb112f..967688d269 100644
--- a/tests/phpt/instance_cache/8_instance_cache_interface_error.php
+++ b/tests/phpt/instance_cache/8_instance_cache_interface_error.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 <?php
 
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/instance_cache/9_instance_cache_abstract.php b/tests/phpt/instance_cache/9_instance_cache_abstract.php
index 99e48f8086..17c1cca525 100644
--- a/tests/phpt/instance_cache/9_instance_cache_abstract.php
+++ b/tests/phpt/instance_cache/9_instance_cache_abstract.php
@@ -1,4 +1,4 @@
-@ok non-idempotent k2_skip
+@ok non-idempotent
 <?php
 
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/interfaces/007_varargs_in_interface.php b/tests/phpt/interfaces/007_varargs_in_interface.php
index 86904a738c..04e5f2b17b 100644
--- a/tests/phpt/interfaces/007_varargs_in_interface.php
+++ b/tests/phpt/interfaces/007_varargs_in_interface.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 interface iWithVariadics {
diff --git a/tests/phpt/interfaces/023_variadic_and_kphp_infer.php b/tests/phpt/interfaces/023_variadic_and_kphp_infer.php
index 48e245fa44..5008e86e81 100644
--- a/tests/phpt/interfaces/023_variadic_and_kphp_infer.php
+++ b/tests/phpt/interfaces/023_variadic_and_kphp_infer.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 interface ITest {
diff --git a/tests/phpt/interfaces/024_instanceof_inside_static_method.php b/tests/phpt/interfaces/024_instanceof_inside_static_method.php
index c104dcfca2..6c12104196 100644
--- a/tests/phpt/interfaces/024_instanceof_inside_static_method.php
+++ b/tests/phpt/interfaces/024_instanceof_inside_static_method.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/job_workers/1_interface_compilation.php b/tests/phpt/job_workers/1_interface_compilation.php
index dbc97add8e..01f8986436 100644
--- a/tests/phpt/job_workers/1_interface_compilation.php
+++ b/tests/phpt/job_workers/1_interface_compilation.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 function test_compilation($should_start) {
diff --git a/tests/phpt/job_workers/2_shared_immutable_messages_basic_compilation.php b/tests/phpt/job_workers/2_shared_immutable_messages_basic_compilation.php
index d14bb897c1..7cdeedaf58 100644
--- a/tests/phpt/job_workers/2_shared_immutable_messages_basic_compilation.php
+++ b/tests/phpt/job_workers/2_shared_immutable_messages_basic_compilation.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 function test_compilation($x) {
diff --git a/tests/phpt/lambdas/004_return_lambda.php b/tests/phpt/lambdas/004_return_lambda.php
index 83f99d10e3..46de40f8ad 100644
--- a/tests/phpt/lambdas/004_return_lambda.php
+++ b/tests/phpt/lambdas/004_return_lambda.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/lambdas/007_use_lambda_inside_class.php b/tests/phpt/lambdas/007_use_lambda_inside_class.php
index 32c237492c..fb16d14642 100644
--- a/tests/phpt/lambdas/007_use_lambda_inside_class.php
+++ b/tests/phpt/lambdas/007_use_lambda_inside_class.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/lambdas/019_unreachable_lambda.php b/tests/phpt/lambdas/019_unreachable_lambda.php
index fd6b69bd8d..4567addfc8 100644
--- a/tests/phpt/lambdas/019_unreachable_lambda.php
+++ b/tests/phpt/lambdas/019_unreachable_lambda.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/lambdas/022_implicit_capturing_of_this.php b/tests/phpt/lambdas/022_implicit_capturing_of_this.php
index 830aa28585..d7b73bdb13 100644
--- a/tests/phpt/lambdas/022_implicit_capturing_of_this.php
+++ b/tests/phpt/lambdas/022_implicit_capturing_of_this.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/lambdas/023_deduce_typed_callable.php b/tests/phpt/lambdas/023_deduce_typed_callable.php
index c49c8e7c68..88e589391c 100644
--- a/tests/phpt/lambdas/023_deduce_typed_callable.php
+++ b/tests/phpt/lambdas/023_deduce_typed_callable.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/lambdas/027_pass_field_as_argument_of_lambda_without_php_doc.php b/tests/phpt/lambdas/027_pass_field_as_argument_of_lambda_without_php_doc.php
index 130fb35935..a8ed5e224d 100644
--- a/tests/phpt/lambdas/027_pass_field_as_argument_of_lambda_without_php_doc.php
+++ b/tests/phpt/lambdas/027_pass_field_as_argument_of_lambda_without_php_doc.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/lambdas/028_pass_lambda_with_use_through_variable_to_internal_functions.php b/tests/phpt/lambdas/028_pass_lambda_with_use_through_variable_to_internal_functions.php
index d5cd1c7273..35091baedf 100644
--- a/tests/phpt/lambdas/028_pass_lambda_with_use_through_variable_to_internal_functions.php
+++ b/tests/phpt/lambdas/028_pass_lambda_with_use_through_variable_to_internal_functions.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/lambdas/032_pass_class_method_as_lambda_to_builtin.php b/tests/phpt/lambdas/032_pass_class_method_as_lambda_to_builtin.php
index e018b1be19..95cc1a8467 100644
--- a/tests/phpt/lambdas/032_pass_class_method_as_lambda_to_builtin.php
+++ b/tests/phpt/lambdas/032_pass_class_method_as_lambda_to_builtin.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 define('A_method', 'increment_by_value');
diff --git a/tests/phpt/lambdas/049_forks_and_lambdas.php b/tests/phpt/lambdas/049_forks_and_lambdas.php
index 970dc4f2bc..c7dff4d464 100644
--- a/tests/phpt/lambdas/049_forks_and_lambdas.php
+++ b/tests/phpt/lambdas/049_forks_and_lambdas.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/lambdas/051_lambdas_and_variadics.php b/tests/phpt/lambdas/051_lambdas_and_variadics.php
index 8af866a3a7..951114f464 100644
--- a/tests/phpt/lambdas/051_lambdas_and_variadics.php
+++ b/tests/phpt/lambdas/051_lambdas_and_variadics.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/lambdas/052_modify_captured_vars.php b/tests/phpt/lambdas/052_modify_captured_vars.php
index e3399a1e55..9888490a04 100644
--- a/tests/phpt/lambdas/052_modify_captured_vars.php
+++ b/tests/phpt/lambdas/052_modify_captured_vars.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 // earlier, modification of used vars inside lambdas was prohibited
diff --git a/tests/phpt/lambdas/054_lambdas_capture_smart_casts.php b/tests/phpt/lambdas/054_lambdas_capture_smart_casts.php
index eb9b9fcf63..fb6aa1ef54 100644
--- a/tests/phpt/lambdas/054_lambdas_capture_smart_casts.php
+++ b/tests/phpt/lambdas/054_lambdas_capture_smart_casts.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 function takeString(string $s) {
diff --git a/tests/phpt/lambdas/104_empty_array_in_extern_function.php b/tests/phpt/lambdas/104_empty_array_in_extern_function.php
index edad525cc4..8bf0b0dc16 100644
--- a/tests/phpt/lambdas/104_empty_array_in_extern_function.php
+++ b/tests/phpt/lambdas/104_empty_array_in_extern_function.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /Variable \$x has Unknown type/
 <?php
 
diff --git a/tests/phpt/lambdas/112_invalid_callbacks_invoked.php b/tests/phpt/lambdas/112_invalid_callbacks_invoked.php
index 796f968780..93f2631be4 100644
--- a/tests/phpt/lambdas/112_invalid_callbacks_invoked.php
+++ b/tests/phpt/lambdas/112_invalid_callbacks_invoked.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /Invalid \(\)-invocation of a non-lambda/
 /Invalid callback passed, could not detect a class or its method/
 <?php
diff --git a/tests/phpt/lambdas/113_array_map_void_callback_fail.php b/tests/phpt/lambdas/113_array_map_void_callback_fail.php
index 449f248ccf..9e5c6bb412 100644
--- a/tests/phpt/lambdas/113_array_map_void_callback_fail.php
+++ b/tests/phpt/lambdas/113_array_map_void_callback_fail.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /function\(\$x\) should return something, but it is void/
 <?php
 
diff --git a/tests/phpt/lambdas/115_use_refs_in_array_map_fail.php b/tests/phpt/lambdas/115_use_refs_in_array_map_fail.php
index 2fcfa9bf6a..8c3922b9f7 100644
--- a/tests/phpt/lambdas/115_use_refs_in_array_map_fail.php
+++ b/tests/phpt/lambdas/115_use_refs_in_array_map_fail.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /You can't pass callbacks with &references to built-in functions/
 <?php
 
diff --git a/tests/phpt/migration_php8/007_string_string_comparison.php b/tests/phpt/migration_php8/007_string_string_comparison.php
index bc43e59ecb..5555fb4914 100644
--- a/tests/phpt/migration_php8/007_string_string_comparison.php
+++ b/tests/phpt/migration_php8/007_string_string_comparison.php
@@ -1,4 +1,4 @@
-@k2_skip kphp_runtime_should_warn
+@kphp_runtime_should_warn
 /Result of checking that the string is numeric in PHP 7 and PHP 8 are different for '100 ' \(PHP7: false, PHP8: true\)/
 /Result of checking that the string is numeric in PHP 7 and PHP 8 are different for '100 ' \(PHP7: false, PHP8: true\)/
 <?php
diff --git a/tests/phpt/migration_php8/009_blank_no_warning.php b/tests/phpt/migration_php8/009_blank_no_warning.php
index 06f74bf384..91d802e265 100644
--- a/tests/phpt/migration_php8/009_blank_no_warning.php
+++ b/tests/phpt/migration_php8/009_blank_no_warning.php
@@ -1,4 +1,4 @@
-@ok k2_skip kphp_runtime_should_not_warn
+@ok kphp_runtime_should_not_warn
 <?php
 
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/mixed/non_primitive/014_class_as_int.php b/tests/phpt/mixed/non_primitive/014_class_as_int.php
index 4d90e08f7a..261cd0cdcc 100644
--- a/tests/phpt/mixed/non_primitive/014_class_as_int.php
+++ b/tests/phpt/mixed/non_primitive/014_class_as_int.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/modulite/001_simple_yaml_project/001_simple_yaml_project.php b/tests/phpt/modulite/001_simple_yaml_project/001_simple_yaml_project.php
index b3b9e91932..72fe71b9f6 100644
--- a/tests/phpt/modulite/001_simple_yaml_project/001_simple_yaml_project.php
+++ b/tests/phpt/modulite/001_simple_yaml_project/001_simple_yaml_project.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 #ifndef KPHP
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/modulite/005_inheritance/005_inheritance.php b/tests/phpt/modulite/005_inheritance/005_inheritance.php
index c7439d33dc..965faa0b39 100644
--- a/tests/phpt/modulite/005_inheritance/005_inheritance.php
+++ b/tests/phpt/modulite/005_inheritance/005_inheritance.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 #ifndef KPHP
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/modulite/123_call_composer_submod/123_call_composer_submod.php b/tests/phpt/modulite/123_call_composer_submod/123_call_composer_submod.php
index 7bcd915ee7..4d94e239a3 100644
--- a/tests/phpt/modulite/123_call_composer_submod/123_call_composer_submod.php
+++ b/tests/phpt/modulite/123_call_composer_submod/123_call_composer_submod.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 KPHP_COMPOSER_ROOT={dir}
 /restricted to call VK\\Strings\\Internals123\\Append123::notExportedF\(\), it's internal in #vk\/strings\/@internals/
 /in VK\\RPC\\Rpc123::callToStringsInternals/
diff --git a/tests/phpt/msgpack_serialize/011_russian_letters.php b/tests/phpt/msgpack_serialize/011_russian_letters.php
index 2e8f297e81..f5d6ca7da7 100644
--- a/tests/phpt/msgpack_serialize/011_russian_letters.php
+++ b/tests/phpt/msgpack_serialize/011_russian_letters.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/msgpack_serialize/015_serialize_with_base.php b/tests/phpt/msgpack_serialize/015_serialize_with_base.php
index 179d53b23d..e9c8e85f80 100644
--- a/tests/phpt/msgpack_serialize/015_serialize_with_base.php
+++ b/tests/phpt/msgpack_serialize/015_serialize_with_base.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/msgpack_serialize/017_deserialize_huge_array.php b/tests/phpt/msgpack_serialize/017_deserialize_huge_array.php
index 9d92121887..842f5085cf 100644
--- a/tests/phpt/msgpack_serialize/017_deserialize_huge_array.php
+++ b/tests/phpt/msgpack_serialize/017_deserialize_huge_array.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/msgpack_serialize/019_serialize_vector_instead_of_map.php b/tests/phpt/msgpack_serialize/019_serialize_vector_instead_of_map.php
index 7c464f157a..8c2b7cec3f 100644
--- a/tests/phpt/msgpack_serialize/019_serialize_vector_instead_of_map.php
+++ b/tests/phpt/msgpack_serialize/019_serialize_vector_instead_of_map.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/msgpack_serialize/020_int64_as_mixed.php b/tests/phpt/msgpack_serialize/020_int64_as_mixed.php
index 8a74194f68..5977b55290 100644
--- a/tests/phpt/msgpack_serialize/020_int64_as_mixed.php
+++ b/tests/phpt/msgpack_serialize/020_int64_as_mixed.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/msgpack_serialize/100_duplicated_tags.php b/tests/phpt/msgpack_serialize/100_duplicated_tags.php
index 0c98f21b92..6221467578 100644
--- a/tests/phpt/msgpack_serialize/100_duplicated_tags.php
+++ b/tests/phpt/msgpack_serialize/100_duplicated_tags.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /kphp-serialized-field: 1 is already in use/
 <?php
 
diff --git a/tests/phpt/msgpack_serialize/101_bad_tag_value.php b/tests/phpt/msgpack_serialize/101_bad_tag_value.php
index e72e55af06..2fc54ef76b 100644
--- a/tests/phpt/msgpack_serialize/101_bad_tag_value.php
+++ b/tests/phpt/msgpack_serialize/101_bad_tag_value.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /kphp-serialized-field\(-10\) must be >=0 and < than 127/
 /kphp-serialized-field\(128\) must be >=0 and < than 127/
 <?php
diff --git a/tests/phpt/msgpack_serialize/103_serialize_with_base.php b/tests/phpt/msgpack_serialize/103_serialize_with_base.php
index 9c918ae4fe..0652cb483f 100644
--- a/tests/phpt/msgpack_serialize/103_serialize_with_base.php
+++ b/tests/phpt/msgpack_serialize/103_serialize_with_base.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /Class A and all its ancestors must be @kphp-serializable if there are instance fields. Class Base is not./
 <?php
 
diff --git a/tests/phpt/msgpack_serialize/105_skipped_tag.php b/tests/phpt/msgpack_serialize/105_skipped_tag.php
index 05bbfec844..12d37b276d 100644
--- a/tests/phpt/msgpack_serialize/105_skipped_tag.php
+++ b/tests/phpt/msgpack_serialize/105_skipped_tag.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /php-serialized-field is required for field: x/
 <?php
 
diff --git a/tests/phpt/msgpack_serialize/106_kphp_tag_static_field.php b/tests/phpt/msgpack_serialize/106_kphp_tag_static_field.php
index e5dcbd5946..3024eb309d 100644
--- a/tests/phpt/msgpack_serialize/106_kphp_tag_static_field.php
+++ b/tests/phpt/msgpack_serialize/106_kphp_tag_static_field.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /kphp-serialized-field is allowed only for instance fields: y/
 <?php
 
diff --git a/tests/phpt/msgpack_serialize/107_serialize_pure_interface.php b/tests/phpt/msgpack_serialize/107_serialize_pure_interface.php
index 4c21fc8c73..eb3b01f412 100644
--- a/tests/phpt/msgpack_serialize/107_serialize_pure_interface.php
+++ b/tests/phpt/msgpack_serialize/107_serialize_pure_interface.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /Called instance_serialize\(\) for class IntA, but it's not marked with @kphp-serializable/
 <?php
 
diff --git a/tests/phpt/msgpack_serialize/108_empty_field_id.php b/tests/phpt/msgpack_serialize/108_empty_field_id.php
index c32a2d9ca5..11e5447342 100644
--- a/tests/phpt/msgpack_serialize/108_empty_field_id.php
+++ b/tests/phpt/msgpack_serialize/108_empty_field_id.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /bad kphp-serialized-field: ''/
 <?php
 
diff --git a/tests/phpt/msgpack_serialize/109_wrong_field_id.php b/tests/phpt/msgpack_serialize/109_wrong_field_id.php
index 911d4f019a..1f06ac4146 100644
--- a/tests/phpt/msgpack_serialize/109_wrong_field_id.php
+++ b/tests/phpt/msgpack_serialize/109_wrong_field_id.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /bad kphp-serialized-field: '0xa'/
 <?php
 
diff --git a/tests/phpt/msgpack_serialize/110_deserialize_class_without_annotation.php b/tests/phpt/msgpack_serialize/110_deserialize_class_without_annotation.php
index d0fe94d088..554eefd759 100644
--- a/tests/phpt/msgpack_serialize/110_deserialize_class_without_annotation.php
+++ b/tests/phpt/msgpack_serialize/110_deserialize_class_without_annotation.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /Called instance_deserialize\(\) for class A, but it's not marked with @kphp-serializable/
 <?php
 
diff --git a/tests/phpt/msgpack_serialize/111_non_serializable_inner_class.php b/tests/phpt/msgpack_serialize/111_non_serializable_inner_class.php
index 1e11a79ee7..06a12dde79 100644
--- a/tests/phpt/msgpack_serialize/111_non_serializable_inner_class.php
+++ b/tests/phpt/msgpack_serialize/111_non_serializable_inner_class.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /class B must be serializable as it is used in field A::b/
 <?php
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/msgpack_serialize/113_duplicated_inherited_tags.php b/tests/phpt/msgpack_serialize/113_duplicated_inherited_tags.php
index a08beeb935..57fdce16cd 100644
--- a/tests/phpt/msgpack_serialize/113_duplicated_inherited_tags.php
+++ b/tests/phpt/msgpack_serialize/113_duplicated_inherited_tags.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /kphp-serialized-field: field with number 1 found in both classes A and B/
 <?php
 
diff --git a/tests/phpt/nn/005_json_encode_force_object.php b/tests/phpt/nn/005_json_encode_force_object.php
index d5f9433a81..b401f16489 100644
--- a/tests/phpt/nn/005_json_encode_force_object.php
+++ b/tests/phpt/nn/005_json_encode_force_object.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
   $empty = array();
   var_dump(json_encode($empty));
diff --git a/tests/phpt/nn/007_preg_match_offset.php b/tests/phpt/nn/007_preg_match_offset.php
index a8665930f4..932050e29b 100644
--- a/tests/phpt/nn/007_preg_match_offset.php
+++ b/tests/phpt/nn/007_preg_match_offset.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 $subject = "abcdef";
 $pattern = '/^def/';
diff --git a/tests/phpt/null_coalescing/11_assumptions.php b/tests/phpt/null_coalescing/11_assumptions.php
index dab6307070..ab735aeb3b 100644
--- a/tests/phpt/null_coalescing/11_assumptions.php
+++ b/tests/phpt/null_coalescing/11_assumptions.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 interface AI {
diff --git a/tests/phpt/null_coalescing/12_assignment.php b/tests/phpt/null_coalescing/12_assignment.php
index 2de0bdd33b..d7b4e307ee 100644
--- a/tests/phpt/null_coalescing/12_assignment.php
+++ b/tests/phpt/null_coalescing/12_assignment.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/null_coalescing/13_assignment_call_rhs.php b/tests/phpt/null_coalescing/13_assignment_call_rhs.php
index e0e7431867..d235a2262e 100644
--- a/tests/phpt/null_coalescing/13_assignment_call_rhs.php
+++ b/tests/phpt/null_coalescing/13_assignment_call_rhs.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 function get_arg(): string {
diff --git a/tests/phpt/null_coalescing/14_assignment_throw_exceptions.php b/tests/phpt/null_coalescing/14_assignment_throw_exceptions.php
index bab734a332..fd717e1aa5 100644
--- a/tests/phpt/null_coalescing/14_assignment_throw_exceptions.php
+++ b/tests/phpt/null_coalescing/14_assignment_throw_exceptions.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/null_coalescing/1_variables.php b/tests/phpt/null_coalescing/1_variables.php
index 62e7fd2d37..af732dde1a 100644
--- a/tests/phpt/null_coalescing/1_variables.php
+++ b/tests/phpt/null_coalescing/1_variables.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/null_coalescing/2_arrays.php b/tests/phpt/null_coalescing/2_arrays.php
index dbbb4228bd..9fb7a3ebf5 100644
--- a/tests/phpt/null_coalescing/2_arrays.php
+++ b/tests/phpt/null_coalescing/2_arrays.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/null_coalescing/3_string.php b/tests/phpt/null_coalescing/3_string.php
index 662775a747..3f80e92bc2 100644
--- a/tests/phpt/null_coalescing/3_string.php
+++ b/tests/phpt/null_coalescing/3_string.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/null_coalescing/5_type_infer.php b/tests/phpt/null_coalescing/5_type_infer.php
index 34c362d0a3..3f565f08c7 100644
--- a/tests/phpt/null_coalescing/5_type_infer.php
+++ b/tests/phpt/null_coalescing/5_type_infer.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 
diff --git a/tests/phpt/null_coalescing/9_tuples.php b/tests/phpt/null_coalescing/9_tuples.php
index ad358d2b51..a958d5e46a 100644
--- a/tests/phpt/null_coalescing/9_tuples.php
+++ b/tests/phpt/null_coalescing/9_tuples.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/optional/002_array_operations.php b/tests/phpt/optional/002_array_operations.php
index baa410f24f..843e76e463 100644
--- a/tests/phpt/optional/002_array_operations.php
+++ b/tests/phpt/optional/002_array_operations.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/optional/003_serialization.php b/tests/phpt/optional/003_serialization.php
index 32ea5019a7..84ea15a006 100644
--- a/tests/phpt/optional/003_serialization.php
+++ b/tests/phpt/optional/003_serialization.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/optional/004_operations.php b/tests/phpt/optional/004_operations.php
index fd2e173f25..8ae85e0e0d 100644
--- a/tests/phpt/optional/004_operations.php
+++ b/tests/phpt/optional/004_operations.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/optional/008_return_optional_from_fork.php b/tests/phpt/optional/008_return_optional_from_fork.php
index aa4c87f7ce..007660f5e3 100644
--- a/tests/phpt/optional/008_return_optional_from_fork.php
+++ b/tests/phpt/optional/008_return_optional_from_fork.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/performance_inspections/13_warn_tag_for_class.php b/tests/phpt/performance_inspections/13_warn_tag_for_class.php
index 69997c42ab..81cfff07db 100644
--- a/tests/phpt/performance_inspections/13_warn_tag_for_class.php
+++ b/tests/phpt/performance_inspections/13_warn_tag_for_class.php
@@ -1,4 +1,4 @@
-@kphp_should_warn k2_skip
+@kphp_should_warn
 /variable \$y1 can be reserved with array_reserve functions family out of loop/
 /Performance inspection 'array\-reserve' enabled by: Test::member_function/
 /expression \$x = array_merge\(\$x, <...>\) can be replaced with array_merge_into\(\$x, <...>\)/
diff --git a/tests/phpt/performance_inspections/14_warn_tag_for_interface.php b/tests/phpt/performance_inspections/14_warn_tag_for_interface.php
index 0d75c15343..b39d3204bf 100644
--- a/tests/phpt/performance_inspections/14_warn_tag_for_interface.php
+++ b/tests/phpt/performance_inspections/14_warn_tag_for_interface.php
@@ -1,4 +1,4 @@
-@kphp_should_warn k2_skip
+@kphp_should_warn
 /variable \$y1 can be reserved with array_reserve functions family out of loop/
 /Performance inspection 'array\-reserve' enabled by: TestInterface::interface_function \-> TestInterfaceImpl1::interface_function/
 /expression \$x = array_merge\(\$x, <...>\) can be replaced with array_merge_into\(\$x, <...>\)/
diff --git a/tests/phpt/performance_inspections/5_array_merge_into_warn.php b/tests/phpt/performance_inspections/5_array_merge_into_warn.php
index 84bf9b1389..6eb3cc1b65 100644
--- a/tests/phpt/performance_inspections/5_array_merge_into_warn.php
+++ b/tests/phpt/performance_inspections/5_array_merge_into_warn.php
@@ -1,4 +1,4 @@
-@kphp_should_warn k2_skip
+@kphp_should_warn
 /expression \$x = array_merge\(\$x, <...>\) can be replaced with array_merge_into\(\$x, <...>\)/
 /expression \$y\['hello'\] = array_merge\(\$y\['hello'\], <...>\) can be replaced with array_merge_into\(\$y\['hello'\], <...>\)/
 /expression \$z\['x'\]\[\$y\['hello'\]\[0\]\] = array_merge\(\$z\['x'\]\[\$y\['hello'\]\[0\]\], <...>\) can be replaced with array_merge_into\(\$z\['x'\]\[\$y\['hello'\]\[0\]\], <...>\)/
diff --git a/tests/phpt/performance_inspections/6_array_merge_into_no_warn.php b/tests/phpt/performance_inspections/6_array_merge_into_no_warn.php
index 43c42e5c9e..1a271de2d6 100644
--- a/tests/phpt/performance_inspections/6_array_merge_into_no_warn.php
+++ b/tests/phpt/performance_inspections/6_array_merge_into_no_warn.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 KPHP_ERROR_ON_WARNINGS=1
 <?php
 
diff --git a/tests/phpt/performance_inspections/9_constant_execution_in_loop_warn.php b/tests/phpt/performance_inspections/9_constant_execution_in_loop_warn.php
index 48b45e2498..51c152a4d9 100644
--- a/tests/phpt/performance_inspections/9_constant_execution_in_loop_warn.php
+++ b/tests/phpt/performance_inspections/9_constant_execution_in_loop_warn.php
@@ -1,4 +1,4 @@
-@kphp_should_warn k2_skip
+@kphp_should_warn
 /string building 'hello '.\$x.\$z\[floor\(sin\(\$x\)\)\] can be saved in a separate variable out of loop/
 /array element \$z\[floor\(sin\(\$x\)\)\] can be saved in a separate variable out of loop/
 /function call floor\(sin\(\$y2\[\$x\]\)\) can be saved in a separate variable out of loop/
diff --git a/tests/phpt/phc/parsing/allowed_offset_types.php b/tests/phpt/phc/parsing/allowed_offset_types.php
index 523ddf4add..9cbda4a75e 100644
--- a/tests/phpt/phc/parsing/allowed_offset_types.php
+++ b/tests/phpt/phc/parsing/allowed_offset_types.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/phc/parsing/assignments.php b/tests/phpt/phc/parsing/assignments.php
index 610bdbcb8a..4d1329d888 100644
--- a/tests/phpt/phc/parsing/assignments.php
+++ b/tests/phpt/phc/parsing/assignments.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
   unset ($b);
 	$a = $b;
diff --git a/tests/phpt/phc/parsing/binops1.php b/tests/phpt/phc/parsing/binops1.php
index a7cb1b7562..d02c942e4f 100644
--- a/tests/phpt/phc/parsing/binops1.php
+++ b/tests/phpt/phc/parsing/binops1.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 # all 4 bit permutations
diff --git a/tests/phpt/phc/parsing/binops3.php b/tests/phpt/phc/parsing/binops3.php
index 8e8593b406..0e3efa8b91 100644
--- a/tests/phpt/phc/parsing/binops3.php
+++ b/tests/phpt/phc/parsing/binops3.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 # all 4 bit permutations
diff --git a/tests/phpt/phc/parsing/binops4.php b/tests/phpt/phc/parsing/binops4.php
index 2554aef990..95fdb9de59 100644
--- a/tests/phpt/phc/parsing/binops4.php
+++ b/tests/phpt/phc/parsing/binops4.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 # all 4 bit permutations
diff --git a/tests/phpt/phc/parsing/negative_literals.php b/tests/phpt/phc/parsing/negative_literals.php
index e0b31c2f98..7f09ab086c 100644
--- a/tests/phpt/phc/parsing/negative_literals.php
+++ b/tests/phpt/phc/parsing/negative_literals.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
   var_dump(- - 0x7ffffffd);
   var_dump(- -0x7ffffffe);
diff --git a/tests/phpt/phc/parsing/php7_4/arglist_trailing_comma.php b/tests/phpt/phc/parsing/php7_4/arglist_trailing_comma.php
index 680d718fbd..56b4e10342 100644
--- a/tests/phpt/phc/parsing/php7_4/arglist_trailing_comma.php
+++ b/tests/phpt/phc/parsing/php7_4/arglist_trailing_comma.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 // See https://wiki.php.net/rfc/trailing-comma-function-calls
diff --git a/tests/phpt/phc/parsing/php7_4/arrowfunc.php b/tests/phpt/phc/parsing/php7_4/arrowfunc.php
index 66bc0bf4dd..20e307ea18 100644
--- a/tests/phpt/phc/parsing/php7_4/arrowfunc.php
+++ b/tests/phpt/phc/parsing/php7_4/arrowfunc.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 function test_var_call() {
diff --git a/tests/phpt/phc/parsing/php7_4/arrowfunc_undef_refparam_error.php b/tests/phpt/phc/parsing/php7_4/arrowfunc_undef_refparam_error.php
index 708951d2c4..422deeeab0 100644
--- a/tests/phpt/phc/parsing/php7_4/arrowfunc_undef_refparam_error.php
+++ b/tests/phpt/phc/parsing/php7_4/arrowfunc_undef_refparam_error.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /\$matches is declared but never written; please, provide a default value/
 <?php
 
diff --git a/tests/phpt/phpdocs/021_failing_callbacks.php b/tests/phpt/phpdocs/021_failing_callbacks.php
index a6e8ad4b10..c07a6d410e 100644
--- a/tests/phpt/phpdocs/021_failing_callbacks.php
+++ b/tests/phpt/phpdocs/021_failing_callbacks.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 KPHP_SHOW_ALL_TYPE_ERRORS=1
 /return int from cb/
 /but it's declared as @return string/
diff --git a/tests/phpt/phpdocs/026_mix_assum_and_subkey.php b/tests/phpt/phpdocs/026_mix_assum_and_subkey.php
index f4b333905d..f16e651345 100644
--- a/tests/phpt/phpdocs/026_mix_assum_and_subkey.php
+++ b/tests/phpt/phpdocs/026_mix_assum_and_subkey.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/phpdocs/027_type_hints_with_phpdocs.php b/tests/phpt/phpdocs/027_type_hints_with_phpdocs.php
index 059c5fe1a2..a6173a8e68 100644
--- a/tests/phpt/phpdocs/027_type_hints_with_phpdocs.php
+++ b/tests/phpt/phpdocs/027_type_hints_with_phpdocs.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/phpdocs/030_hint_but_always_throw.php b/tests/phpt/phpdocs/030_hint_but_always_throw.php
index 1e53c4e456..e09cada2c1 100644
--- a/tests/phpt/phpdocs/030_hint_but_always_throw.php
+++ b/tests/phpt/phpdocs/030_hint_but_always_throw.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/pk/011_substr.php b/tests/phpt/pk/011_substr.php
index 1d5c18bf0a..3b286c3eef 100644
--- a/tests/phpt/pk/011_substr.php
+++ b/tests/phpt/pk/011_substr.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 $str = "abcde";
diff --git a/tests/phpt/pk/026_no_return.php b/tests/phpt/pk/026_no_return.php
index 4eae091617..4dba6d056d 100644
--- a/tests/phpt/pk/026_no_return.php
+++ b/tests/phpt/pk/026_no_return.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/pk/030_header_register_callback_unreachable_in_cli.php b/tests/phpt/pk/030_header_register_callback_unreachable_in_cli.php
index 4d6e9fcd4a..9a4b05755b 100644
--- a/tests/phpt/pk/030_header_register_callback_unreachable_in_cli.php
+++ b/tests/phpt/pk/030_header_register_callback_unreachable_in_cli.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 echo "Zero";
diff --git a/tests/phpt/shutdown_functions/throw_error1.php b/tests/phpt/shutdown_functions/throw_error1.php
index 31dbb73c28..2b1da455ec 100644
--- a/tests/phpt/shutdown_functions/throw_error1.php
+++ b/tests/phpt/shutdown_functions/throw_error1.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /register_shutdown_function should not throw exceptions/
 <?php
 
diff --git a/tests/phpt/shutdown_functions/throw_error2.php b/tests/phpt/shutdown_functions/throw_error2.php
index 7d78e3f07c..b29df808dd 100644
--- a/tests/phpt/shutdown_functions/throw_error2.php
+++ b/tests/phpt/shutdown_functions/throw_error2.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /register_shutdown_function should not throw exceptions/
 <?php
 
diff --git a/tests/phpt/shutdown_functions/throw_error3.php b/tests/phpt/shutdown_functions/throw_error3.php
index c9afcd8b96..d9989f937d 100644
--- a/tests/phpt/shutdown_functions/throw_error3.php
+++ b/tests/phpt/shutdown_functions/throw_error3.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /register_shutdown_function should not throw exceptions/
 <?php
 
diff --git a/tests/phpt/smart_casts/05_inside_operators.php b/tests/phpt/smart_casts/05_inside_operators.php
index 868a491e91..42f3925093 100644
--- a/tests/phpt/smart_casts/05_inside_operators.php
+++ b/tests/phpt/smart_casts/05_inside_operators.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/spread/001_spread.php b/tests/phpt/spread/001_spread.php
index 7b03432012..db8d9641fe 100644
--- a/tests/phpt/spread/001_spread.php
+++ b/tests/phpt/spread/001_spread.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 class Foo {
diff --git a/tests/phpt/sprintf/002_vprintf.php b/tests/phpt/sprintf/002_vprintf.php
index 677657b53d..32fe1a7f84 100644
--- a/tests/phpt/sprintf/002_vprintf.php
+++ b/tests/phpt/sprintf/002_vprintf.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 function nullableString(): ?string {
diff --git a/tests/phpt/stacktrace/10_stacktrace.php b/tests/phpt/stacktrace/10_stacktrace.php
index 635bef55e4..7d4c37a9c6 100644
--- a/tests/phpt/stacktrace/10_stacktrace.php
+++ b/tests/phpt/stacktrace/10_stacktrace.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /return string\|false\|null from getHtml/
 /\$result is string\|false\|null/
 /str_replace returns string\|false\|null/
diff --git a/tests/phpt/string_functions/001_strip_tags_7_4.php b/tests/phpt/string_functions/001_strip_tags_7_4.php
index 20fbfcd12c..f8cad1cfad 100644
--- a/tests/phpt/string_functions/001_strip_tags_7_4.php
+++ b/tests/phpt/string_functions/001_strip_tags_7_4.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 $strings = [
diff --git a/tests/phpt/string_functions/002_substr_replace.php b/tests/phpt/string_functions/002_substr_replace.php
index 69178a3968..3d5c4b8bb0 100644
--- a/tests/phpt/string_functions/002_substr_replace.php
+++ b/tests/phpt/string_functions/002_substr_replace.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 // test substr_replace with potentially incorrect arguments
diff --git a/tests/phpt/string_functions/003_strip_tags_mixed_arg.php b/tests/phpt/string_functions/003_strip_tags_mixed_arg.php
index 8553469752..733fffac1a 100644
--- a/tests/phpt/string_functions/003_strip_tags_mixed_arg.php
+++ b/tests/phpt/string_functions/003_strip_tags_mixed_arg.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /** @param mixed $x */
diff --git a/tests/phpt/string_functions/007_strspn.php b/tests/phpt/string_functions/007_strspn.php
index c6cb336694..aa3c465a9a 100644
--- a/tests/phpt/string_functions/007_strspn.php
+++ b/tests/phpt/string_functions/007_strspn.php
@@ -1,4 +1,4 @@
-@ok php8 k2_skip
+@ok php8
 <?php
 
 $haystacks = [
diff --git a/tests/phpt/tup/013_tuple_inside_fork.php b/tests/phpt/tup/013_tuple_inside_fork.php
index 6d7b42c7ee..cb3f2ff98a 100644
--- a/tests/phpt/tup/013_tuple_inside_fork.php
+++ b/tests/phpt/tup/013_tuple_inside_fork.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 #ifndef KPHP
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/tup/015_tuple_from_fork.php b/tests/phpt/tup/015_tuple_from_fork.php
index 9319ea1227..c11af408b1 100644
--- a/tests/phpt/tup/015_tuple_from_fork.php
+++ b/tests/phpt/tup/015_tuple_from_fork.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 require_once 'kphp_tester_include.php';
 
diff --git a/tests/phpt/typehints/params/08_classes_and_scalars.php b/tests/phpt/typehints/params/08_classes_and_scalars.php
index 3a2f0167c7..ab812ae5c4 100644
--- a/tests/phpt/typehints/params/08_classes_and_scalars.php
+++ b/tests/phpt/typehints/params/08_classes_and_scalars.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 class A {
   public function empty() {}
diff --git a/tests/phpt/typehints/params/variadic/02_classes.php b/tests/phpt/typehints/params/variadic/02_classes.php
index 9fb1f454b8..b1ebdef4da 100644
--- a/tests/phpt/typehints/params/variadic/02_classes.php
+++ b/tests/phpt/typehints/params/variadic/02_classes.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 class ctest {
   public function empty(){}
diff --git a/tests/phpt/typehints/params/variadic/03_nullable.php b/tests/phpt/typehints/params/variadic/03_nullable.php
index 1e6ca55a28..cf6822d2a0 100644
--- a/tests/phpt/typehints/params/variadic/03_nullable.php
+++ b/tests/phpt/typehints/params/variadic/03_nullable.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 function test(?int ...$args) {
   var_dump($args);
diff --git a/tests/phpt/typehints/return_types/01_scalar_typehints.php b/tests/phpt/typehints/return_types/01_scalar_typehints.php
index 32dea4530d..ceb25e135f 100644
--- a/tests/phpt/typehints/return_types/01_scalar_typehints.php
+++ b/tests/phpt/typehints/return_types/01_scalar_typehints.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 const INT_VAL = 10;
 const FLOAT_VAL = 10.5;
diff --git a/tests/phpt/utils/01_kphp_should_not_throw_phpdoc.php b/tests/phpt/utils/01_kphp_should_not_throw_phpdoc.php
index 814c76e794..edfda9faf5 100644
--- a/tests/phpt/utils/01_kphp_should_not_throw_phpdoc.php
+++ b/tests/phpt/utils/01_kphp_should_not_throw_phpdoc.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /really can throw an exception/
 <?php
 
diff --git a/tests/phpt/variadic_args/000_simple_fun_with_variadic_args.php b/tests/phpt/variadic_args/000_simple_fun_with_variadic_args.php
index 1b9f117a16..755511f20e 100644
--- a/tests/phpt/variadic_args/000_simple_fun_with_variadic_args.php
+++ b/tests/phpt/variadic_args/000_simple_fun_with_variadic_args.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/variadic_args/001_fun_with_some_args_before.php b/tests/phpt/variadic_args/001_fun_with_some_args_before.php
index dedff75cf6..558a3c6212 100644
--- a/tests/phpt/variadic_args/001_fun_with_some_args_before.php
+++ b/tests/phpt/variadic_args/001_fun_with_some_args_before.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/variadic_args/002_method_with_variadics.php b/tests/phpt/variadic_args/002_method_with_variadics.php
index fc291dc8a2..ebfa7a1e77 100644
--- a/tests/phpt/variadic_args/002_method_with_variadics.php
+++ b/tests/phpt/variadic_args/002_method_with_variadics.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 class WithStaticVariadicFun {
diff --git a/tests/phpt/variadic_args/003_modification_variadic.php b/tests/phpt/variadic_args/003_modification_variadic.php
index ec22ce7679..a56d8014e4 100644
--- a/tests/phpt/variadic_args/003_modification_variadic.php
+++ b/tests/phpt/variadic_args/003_modification_variadic.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/variadic_args/004_simple_unpacking_array.php b/tests/phpt/variadic_args/004_simple_unpacking_array.php
index 3b623ecedd..da2573d84b 100644
--- a/tests/phpt/variadic_args/004_simple_unpacking_array.php
+++ b/tests/phpt/variadic_args/004_simple_unpacking_array.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/variadic_args/005_unpacking_with_positional_args.php b/tests/phpt/variadic_args/005_unpacking_with_positional_args.php
index 916212d7ba..8c034f5249 100644
--- a/tests/phpt/variadic_args/005_unpacking_with_positional_args.php
+++ b/tests/phpt/variadic_args/005_unpacking_with_positional_args.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/variadic_args/006_unpacking_several_variadics.php b/tests/phpt/variadic_args/006_unpacking_several_variadics.php
index 19d0e90e41..1571fe16c5 100644
--- a/tests/phpt/variadic_args/006_unpacking_several_variadics.php
+++ b/tests/phpt/variadic_args/006_unpacking_several_variadics.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/variadic_args/007_forward_varargs.php b/tests/phpt/variadic_args/007_forward_varargs.php
index 8cdc41afd6..82a17bffa7 100644
--- a/tests/phpt/variadic_args/007_forward_varargs.php
+++ b/tests/phpt/variadic_args/007_forward_varargs.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/variadic_args/008_unpacking_not_variables.php b/tests/phpt/variadic_args/008_unpacking_not_variables.php
index 35546961cb..118d12b1be 100644
--- a/tests/phpt/variadic_args/008_unpacking_not_variables.php
+++ b/tests/phpt/variadic_args/008_unpacking_not_variables.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/variadic_args/009_variadic_lambdas.php b/tests/phpt/variadic_args/009_variadic_lambdas.php
index 16b569c3e8..e5cc04c494 100644
--- a/tests/phpt/variadic_args/009_variadic_lambdas.php
+++ b/tests/phpt/variadic_args/009_variadic_lambdas.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 $f = function($x, ...$args) {
diff --git a/tests/phpt/variadic_args/010_variadic_with_callable.php b/tests/phpt/variadic_args/010_variadic_with_callable.php
index 86b131de57..27795e3a55 100644
--- a/tests/phpt/variadic_args/010_variadic_with_callable.php
+++ b/tests/phpt/variadic_args/010_variadic_with_callable.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/variadic_args/011_pass_callable_with_variadic_as_string.php b/tests/phpt/variadic_args/011_pass_callable_with_variadic_as_string.php
index 605f839f97..9fe78d5177 100644
--- a/tests/phpt/variadic_args/011_pass_callable_with_variadic_as_string.php
+++ b/tests/phpt/variadic_args/011_pass_callable_with_variadic_as_string.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/variadic_args/012_php_doc_variadic.php b/tests/phpt/variadic_args/012_php_doc_variadic.php
index 5e3bc71c5d..979c26c89f 100644
--- a/tests/phpt/variadic_args/012_php_doc_variadic.php
+++ b/tests/phpt/variadic_args/012_php_doc_variadic.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/variadic_args/013_varg_phpdoc_1.php b/tests/phpt/variadic_args/013_varg_phpdoc_1.php
index 1e0ca44e64..45ce7a94ea 100644
--- a/tests/phpt/variadic_args/013_varg_phpdoc_1.php
+++ b/tests/phpt/variadic_args/013_varg_phpdoc_1.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/variadic_args/014_varg_phpdoc_2.php b/tests/phpt/variadic_args/014_varg_phpdoc_2.php
index 6bbe28b6e7..a38aed2e37 100644
--- a/tests/phpt/variadic_args/014_varg_phpdoc_2.php
+++ b/tests/phpt/variadic_args/014_varg_phpdoc_2.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/variadic_args/015_constructor.php b/tests/phpt/variadic_args/015_constructor.php
index 3b23553abe..aedf816d40 100644
--- a/tests/phpt/variadic_args/015_constructor.php
+++ b/tests/phpt/variadic_args/015_constructor.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 class A {
diff --git a/tests/phpt/variadic_args/112_bad_count_after_unpack.php b/tests/phpt/variadic_args/112_bad_count_after_unpack.php
index 668e4b7b99..5692becc07 100644
--- a/tests/phpt/variadic_args/112_bad_count_after_unpack.php
+++ b/tests/phpt/variadic_args/112_bad_count_after_unpack.php
@@ -1,4 +1,4 @@
-@kphp_should_fail k2_skip
+@kphp_should_fail
 /Too many arguments in call to f\(\), expected 2, have 4/
 /Too many arguments in call to f\(\), expected 2, have 5/
 /Too few arguments in call to g\(\), expected 2, have 1/
diff --git a/tests/phpt/warnings/1_ub_foreach_var_trycatch.php b/tests/phpt/warnings/1_ub_foreach_var_trycatch.php
index 8155015564..60ea7a3f5f 100644
--- a/tests/phpt/warnings/1_ub_foreach_var_trycatch.php
+++ b/tests/phpt/warnings/1_ub_foreach_var_trycatch.php
@@ -1,4 +1,4 @@
-@kphp_should_warn k2_skip
+@kphp_should_warn
 /Dangerous undefined behaviour unset, \[foreach var = \$arr\]/
 <?php
 
diff --git a/tests/phpt/warnings/2_ub_foreach_var_trycatch2.php b/tests/phpt/warnings/2_ub_foreach_var_trycatch2.php
index 40b76ac7d1..d3e0b64469 100644
--- a/tests/phpt/warnings/2_ub_foreach_var_trycatch2.php
+++ b/tests/phpt/warnings/2_ub_foreach_var_trycatch2.php
@@ -1,4 +1,4 @@
-@kphp_should_warn k2_skip
+@kphp_should_warn
 /Dangerous undefined behaviour unset, \[foreach var = \$arr\]/
 <?php
 
diff --git a/tests/phpt/warnings/3_ub_var_trycatch.php b/tests/phpt/warnings/3_ub_var_trycatch.php
index 27e80c7631..24dcac68da 100644
--- a/tests/phpt/warnings/3_ub_var_trycatch.php
+++ b/tests/phpt/warnings/3_ub_var_trycatch.php
@@ -1,4 +1,4 @@
-@kphp_should_warn k2_skip
+@kphp_should_warn
 /Dangerous undefined behaviour \+, \[var = \$x\]/
 <?php
 
diff --git a/tests/phpt/zstd/3_compress_uncompress.php b/tests/phpt/zstd/3_compress_uncompress.php
index 7cad8f6cfe..9e36df6204 100644
--- a/tests/phpt/zstd/3_compress_uncompress.php
+++ b/tests/phpt/zstd/3_compress_uncompress.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 require_once 'kphp_tester_include.php';