diff --git a/tests/phpt/dl/394_similar_text.php b/tests/phpt/dl/394_similar_text.php
index 60ab69caec..31fb623052 100644
--- a/tests/phpt/dl/394_similar_text.php
+++ b/tests/phpt/dl/394_similar_text.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 function do_similar_text_test(string $hint, string $first, string $second) {
diff --git a/tests/phpt/dl/429_addslashes.php b/tests/phpt/dl/429_addslashes.php
index b7786a6f3b..f163d25c29 100644
--- a/tests/phpt/dl/429_addslashes.php
+++ b/tests/phpt/dl/429_addslashes.php
@@ -1,4 +1,5 @@
 @ok k2_skip
+k2_skip: stripcslashes is not supported
 <?php
   for ($i = 0; $i < 256; $i++)
     $s_full .= chr ($i);
diff --git a/tests/phpt/dl/467_rawid2long.php b/tests/phpt/dl/467_rawid2long.php
index 22fc9b7e7d..18ed4e0453 100644
--- a/tests/phpt/dl/467_rawid2long.php
+++ b/tests/phpt/dl/467_rawid2long.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
   function dec2hex($dec) {
diff --git a/tests/phpt/dl/472_nbody.php b/tests/phpt/dl/472_nbody.php
index 6b3502ddf9..e6a4ada433 100644
--- a/tests/phpt/dl/472_nbody.php
+++ b/tests/phpt/dl/472_nbody.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/473_file.php b/tests/phpt/dl/473_file.php
index bec4721ab0..eb5a7d6913 100644
--- a/tests/phpt/dl/473_file.php
+++ b/tests/phpt/dl/473_file.php
@@ -1,4 +1,5 @@
 @ok k2_skip
+k2_skip: Unknown function clearstatcache
 <?php
   var_dump (dirname ('..'));
   var_dump (dirname ('phpt/'));
diff --git a/tests/phpt/dl/478_strip_tags.php b/tests/phpt/dl/478_strip_tags.php
index 190b2416e7..5e510e41ee 100644
--- a/tests/phpt/dl/478_strip_tags.php
+++ b/tests/phpt/dl/478_strip_tags.php
@@ -1,4 +1,4 @@
-@ok ok_old_php k2_skip
+@ok ok_old_php
 <?php
   for ($i = 0; $i < 3; ++$i) {
     $str = 'test<br>test';
diff --git a/tests/phpt/dl/480_old_test.php b/tests/phpt/dl/480_old_test.php
index 068471d5ce..97dc554a00 100644
--- a/tests/phpt/dl/480_old_test.php
+++ b/tests/phpt/dl/480_old_test.php
@@ -1,4 +1,5 @@
 @ok benchmark k2_skip
+k2_skip: gethostbynamel is not supported
 <?php
   header('WWW-Authenticate: Negotiate');
   header('WWW-Authenticate: NTLM', false);
diff --git a/tests/phpt/dl/484_strftime.php b/tests/phpt/dl/484_strftime.php
index 77cd9680a1..0b35d27cc0 100644
--- a/tests/phpt/dl/484_strftime.php
+++ b/tests/phpt/dl/484_strftime.php
@@ -1,4 +1,5 @@
 @ok fixme k2_skip
+k2_skip: call to unsupported function : strftime
 <?php
 
 function test() {
diff --git a/tests/phpt/dl/491_strpos.php b/tests/phpt/dl/491_strpos.php
index 7fc701ef4e..629b27637c 100644
--- a/tests/phpt/dl/491_strpos.php
+++ b/tests/phpt/dl/491_strpos.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
   $str = "abacaba asdas nasdn ansdn andsn d";
   var_dump (mb_strtolower($str, 'UTF-8'));
diff --git a/tests/phpt/dl/493_number_format.php b/tests/phpt/dl/493_number_format.php
index fd1a7b62ce..7e0fe398fa 100644
--- a/tests/phpt/dl/493_number_format.php
+++ b/tests/phpt/dl/493_number_format.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 #var_dump(number_format(1e80, 0, '', ' '));
diff --git a/tests/phpt/dl/954_infer.php b/tests/phpt/dl/954_infer.php
index 6e547af7a1..8ca0d02b48 100644
--- a/tests/phpt/dl/954_infer.php
+++ b/tests/phpt/dl/954_infer.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /*
diff --git a/tests/phpt/dl/976_sprintf.php b/tests/phpt/dl/976_sprintf.php
index fe66dcc1f3..1693c23a35 100644
--- a/tests/phpt/dl/976_sprintf.php
+++ b/tests/phpt/dl/976_sprintf.php
@@ -1,4 +1,5 @@
 @ok k2_skip
+k2_skip: Unknown function vprintf
 <?php
 
 printf ("-<a>-%d-<b>-%s-<c>-%f\n", 1, "123", 0.2);
diff --git a/tests/phpt/dl/985_benchmark_sootout_01_lists.php b/tests/phpt/dl/985_benchmark_sootout_01_lists.php
index e334f5aa71..babdcb212f 100644
--- a/tests/phpt/dl/985_benchmark_sootout_01_lists.php
+++ b/tests/phpt/dl/985_benchmark_sootout_01_lists.php
@@ -1,4 +1,4 @@
-@ok benchmark k2_skip
+@ok benchmark
 <?
 /* The Great Computer Language Shootout
    http://shootout.alioth.debian.org/
diff --git a/tests/phpt/exceptions/07_error_methods.php b/tests/phpt/exceptions/07_error_methods.php
index 4e45856ff3..d6db632716 100644
--- a/tests/phpt/exceptions/07_error_methods.php
+++ b/tests/phpt/exceptions/07_error_methods.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 function test() {
diff --git a/tests/phpt/exceptions/08_exception_methods.php b/tests/phpt/exceptions/08_exception_methods.php
index af41ec9c56..321842ca8b 100644
--- a/tests/phpt/exceptions/08_exception_methods.php
+++ b/tests/phpt/exceptions/08_exception_methods.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 function test() {
diff --git a/tests/phpt/generics/023_generic_method_in_interface.php b/tests/phpt/generics/023_generic_method_in_interface.php
index 98b77ca4d4..8518eee3e8 100644
--- a/tests/phpt/generics/023_generic_method_in_interface.php
+++ b/tests/phpt/generics/023_generic_method_in_interface.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/migration_php8/002_string_number_comparison.php b/tests/phpt/migration_php8/002_string_number_comparison.php
index c3b9abfed3..1a52a3a6f3 100644
--- a/tests/phpt/migration_php8/002_string_number_comparison.php
+++ b/tests/phpt/migration_php8/002_string_number_comparison.php
@@ -1,4 +1,4 @@
-@k2_skip kphp_runtime_should_warn
+@k2_skip
 /Comparison \(operator <\) results in PHP 7 and PHP 8 are different for 0 and "foo" \(PHP7: false, PHP8: true\)/
 /Comparison \(operator <\) results in PHP 7 and PHP 8 are different for 42 and "42foo" \(PHP7: false, PHP8: true\)/
 /Comparison \(operator <\) results in PHP 7 and PHP 8 are different for "100foo" and 42 \(PHP7: false, PHP8: true\)/
diff --git a/tests/phpt/modulite/007_composer_ok/007_composer_ok.php b/tests/phpt/modulite/007_composer_ok/007_composer_ok.php
index d46e353d37..5e9ed813c8 100644
--- a/tests/phpt/modulite/007_composer_ok/007_composer_ok.php
+++ b/tests/phpt/modulite/007_composer_ok/007_composer_ok.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 KPHP_COMPOSER_ROOT={dir}
 <?php
 require_once __DIR__ . '/vendor/autoload.php';
diff --git a/tests/phpt/msgpack_serialize/007_msgpack_serialize_var.php b/tests/phpt/msgpack_serialize/007_msgpack_serialize_var.php
index b9ed276a9c..237e89fbed 100644
--- a/tests/phpt/msgpack_serialize/007_msgpack_serialize_var.php
+++ b/tests/phpt/msgpack_serialize/007_msgpack_serialize_var.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 require_once 'kphp_tester_include.php';
diff --git a/tests/phpt/nn/006_substr_replace.php b/tests/phpt/nn/006_substr_replace.php
index 7209e2f18d..87b6817b53 100644
--- a/tests/phpt/nn/006_substr_replace.php
+++ b/tests/phpt/nn/006_substr_replace.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 function substr_replace_test1() {
diff --git a/tests/phpt/nn/009_strnatcmp.php b/tests/phpt/nn/009_strnatcmp.php
index 9803f49a94..a435b29a86 100644
--- a/tests/phpt/nn/009_strnatcmp.php
+++ b/tests/phpt/nn/009_strnatcmp.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 /* Prototype  : int strnatcmp  ( string $str1  , string $str2  )
  * Description: String comparisons using a "natural order" algorithm
diff --git a/tests/phpt/optional/005_string_functions.php b/tests/phpt/optional/005_string_functions.php
index 1740da8483..e2cef75b41 100644
--- a/tests/phpt/optional/005_string_functions.php
+++ b/tests/phpt/optional/005_string_functions.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 /**
diff --git a/tests/phpt/phc/parsing/die.php b/tests/phpt/phc/parsing/die.php
index 3a4e5a923e..b5716b86d3 100644
--- a/tests/phpt/phc/parsing/die.php
+++ b/tests/phpt/phc/parsing/die.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 die;
 die();
diff --git a/tests/phpt/pk/012_array_fill.php b/tests/phpt/pk/012_array_fill.php
index c9f45949c2..d23c77d5ec 100644
--- a/tests/phpt/pk/012_array_fill.php
+++ b/tests/phpt/pk/012_array_fill.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 function demo1() {
diff --git a/tests/phpt/pk/021_minmax.php b/tests/phpt/pk/021_minmax.php
index ae089bc405..673975380d 100644
--- a/tests/phpt/pk/021_minmax.php
+++ b/tests/phpt/pk/021_minmax.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 var_dump(min([1]));
diff --git a/tests/phpt/pk/029_date_default_timezone_get.php b/tests/phpt/pk/029_date_default_timezone_get.php
index 6ec855fd61..b7a3c6b0db 100644
--- a/tests/phpt/pk/029_date_default_timezone_get.php
+++ b/tests/phpt/pk/029_date_default_timezone_get.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 date_default_timezone_set('Europe/Moscow');
diff --git a/tests/phpt/pk/031_header_register_callback_no_invoked_by_flush.php b/tests/phpt/pk/031_header_register_callback_no_invoked_by_flush.php
index 391b75f1c4..018626838b 100644
--- a/tests/phpt/pk/031_header_register_callback_no_invoked_by_flush.php
+++ b/tests/phpt/pk/031_header_register_callback_no_invoked_by_flush.php
@@ -1,4 +1,5 @@
 @ok k2_skip
+k2_skip: call to unsupported function : flush
 <?php
 
 echo "Zero";
diff --git a/tests/phpt/sprintf/001_sprintf.php b/tests/phpt/sprintf/001_sprintf.php
index c48bdb9233..faf7d04a1e 100644
--- a/tests/phpt/sprintf/001_sprintf.php
+++ b/tests/phpt/sprintf/001_sprintf.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 function nullableString(): ?string {
diff --git a/tests/phpt/string_functions/003_str_ireplace.php b/tests/phpt/string_functions/003_str_ireplace.php
index 30c9bd6ccb..ec69e76fcf 100644
--- a/tests/phpt/string_functions/003_str_ireplace.php
+++ b/tests/phpt/string_functions/003_str_ireplace.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 $strings = ["hello", "Hello world", "Hello World hello"];
diff --git a/tests/phpt/string_functions/008_misc.php b/tests/phpt/string_functions/008_misc.php
index cbef2a8e9e..8642468313 100644
--- a/tests/phpt/string_functions/008_misc.php
+++ b/tests/phpt/string_functions/008_misc.php
@@ -1,4 +1,4 @@
-@ok k2_skip
+@ok
 <?php
 
 function extend_test_suite($tests) {
diff --git a/tests/phpt/tcp/basic_connections.php b/tests/phpt/tcp/basic_connections.php
index f1ef8af8f5..e11d92cf98 100644
--- a/tests/phpt/tcp/basic_connections.php
+++ b/tests/phpt/tcp/basic_connections.php
@@ -1,4 +1,5 @@
 @ok k2_skip tcp_server:48091
+k2_skip: call to unsupported function : fgetc
 <?php
 
 function test_simple_connection($address, $request) {
diff --git a/tests/phpt/tcp/connection_options.php b/tests/phpt/tcp/connection_options.php
index b57f839dc0..2f59775be0 100644
--- a/tests/phpt/tcp/connection_options.php
+++ b/tests/phpt/tcp/connection_options.php
@@ -1,4 +1,5 @@
 @ok k2_skip tcp_server:48092
+k2_skip: Unknown function stream_set_blocking
 <?php
 
 function test_non_blocking_connection($address, $request) {
diff --git a/tests/phpt/warnings/6_disable_warnings.php b/tests/phpt/warnings/6_disable_warnings.php
index 8bfe6281c6..15acc5482e 100644
--- a/tests/phpt/warnings/6_disable_warnings.php
+++ b/tests/phpt/warnings/6_disable_warnings.php
@@ -1,4 +1,4 @@
-@kphp_runtime_should_not_warn ok k2_skip
+@kphp_runtime_should_not_warn ok
 <?php
 
 function should_warn() {