diff --git a/ext/bz2/bug71263.phpt b/ext/bz2/tests/bug71263.phpt
similarity index 94%
rename from ext/bz2/bug71263.phpt
rename to ext/bz2/tests/bug71263.phpt
index 387c06bfdb0..d5c3ff91dae 100644
--- a/ext/bz2/bug71263.phpt
+++ b/ext/bz2/tests/bug71263.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #71263: fread() does not detects decoding errors from filter bzip2.decompress
+--SKIPIF--
+<?php if (!extension_loaded("bz2")) print "skip bz2 extension not loaded"; ?>
 --FILE--
 <?php
 
diff --git a/ext/intl/tests/bug77895.phpt b/ext/intl/tests/bug77895.phpt
index 18b4f778e60..17a86fd4102 100644
--- a/ext/intl/tests/bug77895.phpt
+++ b/ext/intl/tests/bug77895.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #77895: IntlDateFormatter::create fails in strict mode if $locale = null 
+--SKIPIF--
+<?php if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?>
 --FILE--
 <?php
 
diff --git a/ext/intl/tests/dateformat_bug65683_2.phpt b/ext/intl/tests/dateformat_bug65683_2.phpt
index 1a709e4ae93..783ac4abd41 100644
--- a/ext/intl/tests/dateformat_bug65683_2.phpt
+++ b/ext/intl/tests/dateformat_bug65683_2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #65683: Intl does not support DateTimeImmutable (using datefmt_format_object)
+--SKIPIF--
+<?php if (!extension_loaded('intl')) die('skip intl extension not enabled'); ?>
 --FILE--
 <?php
 $date = date_create('1970-01-01');
diff --git a/ext/json/tests/bug77843.phpt b/ext/json/tests/bug77843.phpt
index c525285bf5a..dbcb024c268 100644
--- a/ext/json/tests/bug77843.phpt
+++ b/ext/json/tests/bug77843.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #77843: Use after free with json serializer
+--SKIPIF--
+<?php if(!extension_loaded('json')) die('skip json extension not loaded') ?>
 --FILE--
 <?php
 
diff --git a/ext/session/tests/bug71162.phpt b/ext/session/tests/bug71162.phpt
index 722889d417a..31d3370499b 100644
--- a/ext/session/tests/bug71162.phpt
+++ b/ext/session/tests/bug71162.phpt
@@ -1,5 +1,7 @@
 --TEST--
 updateTimestamp never called when session data is empty
+--SKIPIF--
+<?php include('skipif.inc'); ?>
 --INI--
 session.use_strict_mode=0
 session.save_handler=files
diff --git a/ext/session/tests/bug74892.phpt b/ext/session/tests/bug74892.phpt
index a4c977828a3..0947df7761d 100644
--- a/ext/session/tests/bug74892.phpt
+++ b/ext/session/tests/bug74892.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #74892 Url Rewriting (trans_sid) not working on urls that start with #
+--SKIPIF--
+<?php include('skipif.inc'); ?>
 --FILE--
 <?php
 ini_set('session.use_cookies', '0');
diff --git a/ext/tokenizer/tests/bad_character.phpt b/ext/tokenizer/tests/bad_character.phpt
index 0c6b1136a68..87f0179004e 100644
--- a/ext/tokenizer/tests/bad_character.phpt
+++ b/ext/tokenizer/tests/bad_character.phpt
@@ -1,5 +1,7 @@
 --TEST--
 token_get_all() produces T_BAD_CHARACTER for unexpected characters
+--SKIPIF--
+<?php if (!extension_loaded("tokenizer")) print "skip tokenizer extension not enabled"; ?>
 --FILE--
 <?php
 
diff --git a/ext/tokenizer/tests/bug76991.phpt b/ext/tokenizer/tests/bug76991.phpt
index 261abc59819..72f36cec3f7 100644
--- a/ext/tokenizer/tests/bug76991.phpt
+++ b/ext/tokenizer/tests/bug76991.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #76991: Incorrect tokenization of multiple invalid flexible heredoc strings
+--SKIPIF--
+<?php if (!extension_loaded("tokenizer")) print "skip tokenizer extension not enabled"; ?>
 --FILE--
 <?php
 
diff --git a/ext/tokenizer/no_inline_html_split.phpt b/ext/tokenizer/tests/no_inline_html_split.phpt
similarity index 73%
rename from ext/tokenizer/no_inline_html_split.phpt
rename to ext/tokenizer/tests/no_inline_html_split.phpt
index 7d5f75d6a35..37608d73e03 100644
--- a/ext/tokenizer/no_inline_html_split.phpt
+++ b/ext/tokenizer/tests/no_inline_html_split.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Inline HTML should not be split at partial PHP tags
+--SKIPIF--
+<?php if (!extension_loaded("tokenizer")) print "skip tokenizer extension not enabled"; ?>
 --INI--
 short_open_tag=0
 --FILE--
diff --git a/ext/tokenizer/tests/php_tag_only.phpt b/ext/tokenizer/tests/php_tag_only.phpt
index a6df7ded4db..aec11f9e16c 100644
--- a/ext/tokenizer/tests/php_tag_only.phpt
+++ b/ext/tokenizer/tests/php_tag_only.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Tokenization of only the <?php tag
+--SKIPIF--
+<?php if (!extension_loaded("tokenizer")) print "skip tokenizer extension not enabled"; ?>
 --FILE--
 <?php
 
diff --git a/ext/zlib/tests/bug71417.phpt b/ext/zlib/tests/bug71417.phpt
index 717b2effe42..ae1390134e2 100644
--- a/ext/zlib/tests/bug71417.phpt
+++ b/ext/zlib/tests/bug71417.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #71417: fread() does not detect decoding errors from filter zlib.inflate
+--SKIPIF--
+<?php if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build'); ?>
 --FILE--
 <?php