From e9f783fcddeeeff903481f147928ca1063681ab6 Mon Sep 17 00:00:00 2001
From: Max Semenik <maxsem.wiki@gmail.com>
Date: Thu, 1 Apr 2021 15:16:17 +0300
Subject: [PATCH] Migrate skip checks to --EXTENSIONS--, p3

For rationale, see #6787

Extensions migrated in part 3:
* ftp
* gmp
* iconv
* opcache
* shmop
---
 ext/ftp/tests/001.phpt                          |   7 +++----
 ext/ftp/tests/002.phpt                          |   6 ++++--
 ext/ftp/tests/003.phpt                          |   7 +++----
 ext/ftp/tests/004.phpt                          |   7 +++----
 ext/ftp/tests/005.phpt                          |   7 +++----
 ext/ftp/tests/007.phpt                          |   7 +++----
 ext/ftp/tests/bug27809.phpt                     |   7 +++----
 ext/ftp/tests/bug37799.phpt                     |   6 ++++--
 ext/ftp/tests/bug39458-2.phpt                   |   7 +++----
 ext/ftp/tests/bug39458.phpt                     |   7 +++----
 ext/ftp/tests/bug39583-2.phpt                   |   7 +++----
 ext/ftp/tests/bug39583.phpt                     |   7 +++----
 ext/ftp/tests/bug7216-2.phpt                    |   7 +++----
 ext/ftp/tests/bug7216.phpt                      |   7 +++----
 ext/ftp/tests/dead-resource.phpt                |   6 +++---
 ext/ftp/tests/filesize_large.phpt               |   4 +++-
 ext/ftp/tests/ftp_alloc_basic1.phpt             |   7 +++----
 ext/ftp/tests/ftp_alloc_basic2.phpt             |   7 +++----
 ext/ftp/tests/ftp_append.phpt                   |   7 +++----
 ext/ftp/tests/ftp_chmod_basic.phpt              |   7 +++----
 ext/ftp/tests/ftp_constructor.phpt              |   6 +++---
 ext/ftp/tests/ftp_delete.phpt                   |   5 +++--
 ext/ftp/tests/ftp_exec_basic.phpt               |   7 +++----
 ext/ftp/tests/ftp_fget_basic.phpt               |   7 +++----
 ext/ftp/tests/ftp_fget_basic1.phpt              |   7 +++----
 ext/ftp/tests/ftp_fget_basic2.phpt              |   7 +++----
 ext/ftp/tests/ftp_fget_basic3.phpt              |   7 +++----
 ext/ftp/tests/ftp_fput.phpt                     |   5 +++--
 ext/ftp/tests/ftp_get_basic.phpt                |   7 +++----
 ext/ftp/tests/ftp_get_option.phpt               |   5 +++--
 ext/ftp/tests/ftp_mdtm_basic.phpt               |   7 +++----
 ext/ftp/tests/ftp_mlsd.phpt                     |   7 +++----
 ext/ftp/tests/ftp_mlsd_empty_directory.phpt     |   7 +++----
 ext/ftp/tests/ftp_mlsd_missing_directory.phpt   |   7 +++----
 ext/ftp/tests/ftp_nb_continue.phpt              |   7 +++----
 ext/ftp/tests/ftp_nb_fget_basic1.phpt           |   7 +++----
 ext/ftp/tests/ftp_nb_fget_basic2.phpt           |   7 +++----
 ext/ftp/tests/ftp_nb_fget_basic3.phpt           |   7 +++----
 ext/ftp/tests/ftp_nb_fput.phpt                  |   5 +++--
 ext/ftp/tests/ftp_nb_get_large.phpt             |   4 +++-
 ext/ftp/tests/ftp_nb_put.phpt                   |   5 +++--
 ext/ftp/tests/ftp_pasv.phpt                     |   5 +++--
 ext/ftp/tests/ftp_rawlist_basic1.phpt           |   5 +++--
 ext/ftp/tests/ftp_rawlist_basic2.phpt           |   7 +++----
 ext/ftp/tests/ftp_rename_basic1.phpt            |   7 +++----
 ext/ftp/tests/ftp_rmdir_basic.phpt              |   7 +++----
 ext/ftp/tests/ftp_set_option.phpt               |   5 +++--
 ext/ftp/tests/ftp_set_option_errors.phpt        |   5 +++--
 ext/ftp/tests/ftp_site_basic.phpt               |   5 +++--
 ext/ftp/tests/ftp_ssl_connect_error.phpt        |   6 ++++--
 ext/ftp/tests/skipif.inc                        |   5 -----
 ext/gmp/tests/002.phpt                          |   4 ++--
 ext/gmp/tests/003.phpt                          |   4 ++--
 ext/gmp/tests/bug32773.phpt                     |   4 ++--
 ext/gmp/tests/bug50175.phpt                     |   4 ++--
 ext/gmp/tests/bug50283.phpt                     |   4 ++--
 ext/gmp/tests/bug52906.phpt                     |   4 ++--
 ext/gmp/tests/bug659967.phpt                    |   4 ++--
 ext/gmp/tests/bug66872.phpt                     |   4 ++--
 ext/gmp/tests/bug67917.phpt                     |   4 ++--
 ext/gmp/tests/bug69803.phpt                     |   4 ++--
 ext/gmp/tests/bug70284.phpt                     |   4 ++--
 ext/gmp/tests/bug74670.phpt                     |   2 ++
 ext/gmp/tests/bug80560.phpt                     |   4 ++--
 ext/gmp/tests/cast.phpt                         |   4 ++--
 ext/gmp/tests/clone.phpt                        |   4 ++--
 ext/gmp/tests/comparison.phpt                   |   4 ++--
 ext/gmp/tests/comparison_invalid.phpt           |   4 ++--
 ext/gmp/tests/gmp_abs.phpt                      |   4 ++--
 ext/gmp/tests/gmp_and.phpt                      |   4 ++--
 ext/gmp/tests/gmp_binomial.phpt                 |   4 ++--
 ext/gmp/tests/gmp_clrbit.phpt                   |   4 ++--
 ext/gmp/tests/gmp_cmp.phpt                      |   4 ++--
 ext/gmp/tests/gmp_com.phpt                      |   4 ++--
 ext/gmp/tests/gmp_div_q.phpt                    |   4 ++--
 ext/gmp/tests/gmp_div_qr.phpt                   |   4 ++--
 ext/gmp/tests/gmp_div_r.phpt                    |   4 ++--
 ext/gmp/tests/gmp_divexact.phpt                 |   3 ++-
 ext/gmp/tests/gmp_export.phpt                   |   4 ++--
 ext/gmp/tests/gmp_fact.phpt                     |   4 ++--
 ext/gmp/tests/gmp_gcd.phpt                      |   4 ++--
 ext/gmp/tests/gmp_gcdext.phpt                   |   5 ++---
 ext/gmp/tests/gmp_hamdist.phpt                  |   4 ++--
 ext/gmp/tests/gmp_import.phpt                   |   4 ++--
 ext/gmp/tests/gmp_init.phpt                     |   4 ++--
 ext/gmp/tests/gmp_init_integer_notations.phpt   |   4 ++--
 ext/gmp/tests/gmp_intval.phpt                   |   4 ++--
 ext/gmp/tests/gmp_invert.phpt                   |   4 ++--
 ext/gmp/tests/gmp_jacobi.phpt                   |   4 ++--
 ext/gmp/tests/gmp_kronecker.phpt                |   4 ++--
 ext/gmp/tests/gmp_lcm.phpt                      |   4 ++--
 ext/gmp/tests/gmp_legendre.phpt                 |   4 ++--
 ext/gmp/tests/gmp_mod.phpt                      |   4 ++--
 ext/gmp/tests/gmp_neg.phpt                      |   4 ++--
 ext/gmp/tests/gmp_nextprime.phpt                |   5 ++---
 ext/gmp/tests/gmp_or.phpt                       |   4 ++--
 ext/gmp/tests/gmp_perfect_power.phpt            |   4 ++--
 ext/gmp/tests/gmp_perfect_square.phpt           |   4 ++--
 ext/gmp/tests/gmp_php_int_max.phpt              |   3 ++-
 ext/gmp/tests/gmp_popcount.phpt                 |   4 ++--
 ext/gmp/tests/gmp_pow.phpt                      |   4 ++--
 ext/gmp/tests/gmp_pow2.phpt                     |   4 ++--
 ext/gmp/tests/gmp_pown.phpt                     |   4 ++--
 ext/gmp/tests/gmp_prob_prime.phpt               |   4 ++--
 ext/gmp/tests/gmp_random_bits.phpt              |   4 ++--
 ext/gmp/tests/gmp_random_range.phpt             |   4 ++--
 ext/gmp/tests/gmp_random_seed.phpt              |   3 ++-
 ext/gmp/tests/gmp_remroot.phpt                  |   4 ++--
 ext/gmp/tests/gmp_root.phpt                     |   4 ++--
 ext/gmp/tests/gmp_scan0.phpt                    |   4 ++--
 ext/gmp/tests/gmp_scan1.phpt                    |   4 ++--
 ext/gmp/tests/gmp_setbit.phpt                   |   4 ++--
 ext/gmp/tests/gmp_setbit_long.phpt              |   3 ++-
 ext/gmp/tests/gmp_sign.phpt                     |   4 ++--
 ext/gmp/tests/gmp_sqrt.phpt                     |   4 ++--
 ext/gmp/tests/gmp_sqrtrem.phpt                  |   4 ++--
 ext/gmp/tests/gmp_strict_types.phpt             |   2 ++
 ext/gmp/tests/gmp_strval.phpt                   |   4 ++--
 ext/gmp/tests/gmp_sub.phpt                      |   4 ++--
 ext/gmp/tests/gmp_testbit.phpt                  |   4 ++--
 ext/gmp/tests/gmp_xor.phpt                      |   4 ++--
 ext/gmp/tests/overloading.phpt                  |   4 ++--
 ext/gmp/tests/serialize.phpt                    |   4 ++--
 ext/gmp/tests/surprising_integer_literals.phpt  |   4 ++--
 ext/gmp/tests/unserialize_with_reference.phpt   |   4 ++--
 ext/iconv/tests/bug37176.phpt                   |   3 ++-
 ext/iconv/tests/bug37773.phpt                   |   3 ++-
 ext/iconv/tests/bug48147.phpt                   |   4 ++--
 ext/iconv/tests/bug48289.phpt                   |   4 ++--
 ext/iconv/tests/bug51250.phpt                   |   4 ++--
 ext/iconv/tests/bug52211.phpt                   |   6 ++----
 ext/iconv/tests/bug52941.phpt                   |   4 ++--
 ext/iconv/tests/bug53304.phpt                   |   4 ++--
 ext/iconv/tests/bug53891.phpt                   |   6 ++----
 ext/iconv/tests/bug55146.phpt                   |   6 ++----
 ext/iconv/tests/bug60494.phpt                   |   6 ++----
 ext/iconv/tests/bug63839.phpt                   |   6 ++----
 ext/iconv/tests/bug66828.phpt                   |   6 ++----
 ext/iconv/tests/bug68180.phpt                   |   6 ++----
 ext/iconv/tests/bug69840.phpt                   |   4 ++--
 ext/iconv/tests/bug72320.phpt                   |   6 ++----
 ext/iconv/tests/bug76249.phpt                   |   4 ++--
 ext/iconv/tests/bug77147.phpt                   |   6 ++----
 ext/iconv/tests/bug78069.phpt                   |   6 ++----
 ext/iconv/tests/bug79200.phpt                   |   6 ++----
 ext/iconv/tests/eucjp2iso2022jp.phpt            |   4 ++--
 ext/iconv/tests/eucjp2sjis.phpt                 |   4 ++--
 ext/iconv/tests/eucjp2utf8.phpt                 |   4 ++--
 .../iconv-charset-length-cve-2007-4840.phpt     |   4 ++--
 ext/iconv/tests/iconv001.phpt                   |   4 ++--
 ext/iconv/tests/iconv002.phpt                   |   3 ++-
 ext/iconv/tests/iconv003.phpt                   |   4 ++--
 ext/iconv/tests/iconv004.phpt                   |   4 ++--
 ext/iconv/tests/iconv_basic.phpt                |   7 ++-----
 ext/iconv/tests/iconv_basic_001-win32.phpt      |   3 ++-
 ext/iconv/tests/iconv_basic_001.phpt            |   3 ++-
 ext/iconv/tests/iconv_default_charset.phpt      |   7 ++-----
 ext/iconv/tests/iconv_encoding_basic.phpt       |   7 ++-----
 ext/iconv/tests/iconv_get_encoding_basic.phpt   |   4 ++--
 ext/iconv/tests/iconv_ini_encoding.phpt         |   4 ++--
 ...ime_decode-charset-length-cve-2007-4840.phpt |   4 ++--
 ext/iconv/tests/iconv_mime_decode.phpt          |   4 ++--
 ...de_headers-charset-length-cve-2007-4840.phpt |   4 ++--
 ext/iconv/tests/iconv_mime_decode_headers.phpt  |   4 ++--
 ext/iconv/tests/iconv_mime_encode.phpt          |   4 ++--
 ...t_encoding-charset-length-cve-2007-4840.phpt |   4 ++--
 ext/iconv/tests/iconv_stream_filter.phpt        |   4 ++--
 .../tests/iconv_stream_filter_delimiter.phpt    |   4 ++--
 ...onv_strlen-charset-length-cve-2007-4840.phpt |   4 ++--
 ext/iconv/tests/iconv_strlen.phpt               |   4 ++--
 ext/iconv/tests/iconv_strlen_basic.phpt         |   7 ++-----
 ext/iconv/tests/iconv_strlen_error2.phpt        |   7 ++-----
 ...onv_strpos-charset-length-cve-2007-4840.phpt |   4 ++--
 ext/iconv/tests/iconv_strpos.phpt               |   4 ++--
 ext/iconv/tests/iconv_strpos_basic.phpt         |   7 ++-----
 ext/iconv/tests/iconv_strpos_error2.phpt        |   7 ++-----
 ext/iconv/tests/iconv_strpos_variation5.phpt    |   7 ++-----
 ...nv_strrpos-charset-length-cve-2007-4840.phpt |   4 ++--
 ext/iconv/tests/iconv_strrpos.phpt              |   4 ++--
 ext/iconv/tests/iconv_strrpos_basic.phpt        |   7 ++-----
 ext/iconv/tests/iconv_strrpos_error2.phpt       |   7 ++-----
 ...onv_substr-charset-length-cve-2007-4783.phpt |   4 ++--
 ext/iconv/tests/iconv_substr.phpt               |   4 ++--
 ext/iconv/tests/iconv_substr_basic.phpt         |   7 ++-----
 ext/iconv/tests/iconv_substr_error2.phpt        |   7 ++-----
 ext/iconv/tests/iconv_substr_out_of_bounds.phpt |   4 ++--
 ...nv_handler-charset-length-cve-2007-4840.phpt |   4 ++--
 ext/iconv/tests/ob_iconv_handler.phpt           |   4 ++--
 ext/iconv/tests/skipif.inc                      |   5 -----
 ext/iconv/tests/translit-failure.phpt           |   3 ++-
 ext/iconv/tests/translit-utf8.phpt              |   3 ++-
 ext/opcache/tests/001_cli.phpt                  |   4 ++--
 .../tests/assign_obj_op_of_fetch_dim.phpt       |   2 ++
 ext/opcache/tests/blacklist-win32.phpt          |   3 ++-
 ext/opcache/tests/blacklist.phpt                |   3 ++-
 ext/opcache/tests/block_pass_001.phpt           |   4 ++--
 ...block_removal_with_duplicate_successors.phpt |   4 ++--
 ext/opcache/tests/bool_cp_in_pass1.phpt         |   4 ++--
 ext/opcache/tests/bool_not_cv.phpt              |   4 ++--
 ext/opcache/tests/bu69838.phpt                  |   4 ++--
 ext/opcache/tests/bug64353.phpt                 |   4 ++--
 ext/opcache/tests/bug64482.phpt                 |   4 ++--
 ext/opcache/tests/bug65510.phpt                 |   4 ++--
 ext/opcache/tests/bug65559.phpt                 |   4 ++--
 ext/opcache/tests/bug65665.phpt                 |   4 ++--
 ext/opcache/tests/bug65845.phpt                 |   4 ++--
 ext/opcache/tests/bug65915.phpt                 |   3 ++-
 ext/opcache/tests/bug66176.phpt                 |   4 ++--
 ext/opcache/tests/bug66251.phpt                 |   4 ++--
 ext/opcache/tests/bug66334.phpt                 |   4 ++--
 ext/opcache/tests/bug66338.phpt                 |   4 ++--
 ext/opcache/tests/bug66440.phpt                 |   4 ++--
 ext/opcache/tests/bug66461.phpt                 |   4 ++--
 ext/opcache/tests/bug66474.phpt                 |   4 ++--
 ext/opcache/tests/bug67215.phpt                 |   4 ++--
 ext/opcache/tests/bug68104.phpt                 |   4 ++--
 ext/opcache/tests/bug69038.phpt                 |   4 ++--
 ext/opcache/tests/bug69125.phpt                 |   4 ++--
 ext/opcache/tests/bug69159.phpt                 |   4 ++--
 ext/opcache/tests/bug69281.phpt                 |   4 ++--
 ext/opcache/tests/bug69549.phpt                 |   4 ++--
 ext/opcache/tests/bug69688.phpt                 |   4 ++--
 ext/opcache/tests/bug70111.phpt                 |   4 ++--
 ext/opcache/tests/bug70207.phpt                 |   4 ++--
 ext/opcache/tests/bug70237.phpt                 |   4 ++--
 ext/opcache/tests/bug70423.phpt                 |   4 ++--
 ext/opcache/tests/bug71127.phpt                 |   4 ++--
 ext/opcache/tests/bug71443.phpt                 |   3 ++-
 ext/opcache/tests/bug71843.phpt                 |   4 ++--
 ext/opcache/tests/bug72014.phpt                 |   4 ++--
 ext/opcache/tests/bug72762.phpt                 |   4 ++--
 ext/opcache/tests/bug73402.phpt                 |   4 ++--
 ext/opcache/tests/bug73583.phpt                 |   4 ++--
 ext/opcache/tests/bug73654.phpt                 |   4 ++--
 ext/opcache/tests/bug73668.phpt                 |   4 ++--
 ext/opcache/tests/bug73746.phpt                 |   4 ++--
 ext/opcache/tests/bug73789.phpt                 |   6 +++---
 ext/opcache/tests/bug73847.phpt                 |   4 ++--
 ext/opcache/tests/bug74019.phpt                 |   4 ++--
 ext/opcache/tests/bug74152.phpt                 |   4 ++--
 ext/opcache/tests/bug74431.phpt                 |   4 ++--
 ext/opcache/tests/bug74442.phpt                 |   4 ++--
 ext/opcache/tests/bug74456.phpt                 |   4 ++--
 ext/opcache/tests/bug74596.phpt                 |   4 ++--
 ext/opcache/tests/bug74623.phpt                 |   4 ++--
 ext/opcache/tests/bug74663.phpt                 |   4 ++--
 ext/opcache/tests/bug74980.phpt                 |   4 ++--
 ext/opcache/tests/bug75230.phpt                 |   4 ++--
 ext/opcache/tests/bug75255.phpt                 |   4 ++--
 ext/opcache/tests/bug75357.phpt                 |   4 ++--
 ext/opcache/tests/bug75370.phpt                 |   4 ++--
 ext/opcache/tests/bug75556.phpt                 |   4 ++--
 ext/opcache/tests/bug75570.phpt                 |   4 ++--
 ext/opcache/tests/bug75608.phpt                 |   4 ++--
 ext/opcache/tests/bug75681.phpt                 |   4 ++--
 ext/opcache/tests/bug75687.phpt                 |   4 ++--
 ext/opcache/tests/bug75698.phpt                 |   4 ++--
 ext/opcache/tests/bug75938.phpt                 |   4 ++--
 ext/opcache/tests/bug75969.phpt                 |   4 ++--
 ext/opcache/tests/bug76074.phpt                 |   4 ++--
 ext/opcache/tests/bug76094.phpt                 |   4 ++--
 ext/opcache/tests/bug76275.phpt                 |   4 ++--
 ext/opcache/tests/bug76281.phpt                 |   4 ++--
 ext/opcache/tests/bug76337.phpt                 |   6 +++---
 ext/opcache/tests/bug76446.phpt                 |   4 ++--
 ext/opcache/tests/bug76463.phpt                 |   4 ++--
 ext/opcache/tests/bug76466.phpt                 |   4 ++--
 ext/opcache/tests/bug76477.phpt                 |   4 ++--
 ext/opcache/tests/bug76711.phpt                 |   4 ++--
 ext/opcache/tests/bug76796.phpt                 |   4 ++--
 ext/opcache/tests/bug77058.phpt                 |   4 ++--
 ext/opcache/tests/bug77092.phpt                 |   4 ++--
 ext/opcache/tests/bug77191.phpt                 |   2 ++
 ext/opcache/tests/bug77215.phpt                 |   4 ++--
 ext/opcache/tests/bug77257.phpt                 |   4 ++--
 ext/opcache/tests/bug77266.phpt                 |   4 ++--
 ext/opcache/tests/bug77275.phpt                 |   4 ++--
 ext/opcache/tests/bug77310_1.phpt               |   4 ++--
 ext/opcache/tests/bug77434.phpt                 |   4 ++--
 ext/opcache/tests/bug77691.phpt                 |   4 ++--
 ext/opcache/tests/bug77743.phpt                 |   4 ++--
 ext/opcache/tests/bug78014.phpt                 |   3 ++-
 ext/opcache/tests/bug78015.phpt                 |   4 ++--
 ext/opcache/tests/bug78034.phpt                 |   4 ++--
 ext/opcache/tests/bug78106.phpt                 |   4 ++--
 ext/opcache/tests/bug78175.phpt                 |   3 ++-
 ext/opcache/tests/bug78175_2.phpt               |   3 ++-
 ext/opcache/tests/bug78185.phpt                 |   4 ++--
 ext/opcache/tests/bug78189.phpt                 |   3 ++-
 ext/opcache/tests/bug78230.phpt                 |   2 ++
 ext/opcache/tests/bug78341.phpt                 |   2 ++
 ext/opcache/tests/bug78376.phpt                 |   3 ++-
 ext/opcache/tests/bug78429.phpt                 |   4 ++--
 ext/opcache/tests/bug78937_1.phpt               |   3 ++-
 ext/opcache/tests/bug78937_2.phpt               |   3 ++-
 ext/opcache/tests/bug78937_3.phpt               |   3 ++-
 ext/opcache/tests/bug78937_4.phpt               |   3 ++-
 ext/opcache/tests/bug78937_5.phpt               |   3 ++-
 ext/opcache/tests/bug78937_6.phpt               |   3 ++-
 ext/opcache/tests/bug78986.phpt                 |   2 ++
 ext/opcache/tests/bug79193.phpt                 |   2 ++
 ext/opcache/tests/bug79412.phpt                 |   4 ++--
 ext/opcache/tests/bug79475.phpt                 |   4 ++--
 ext/opcache/tests/bug79535.phpt                 |   2 ++
 ext/opcache/tests/bug79665.phpt                 |   6 ++----
 ext/opcache/tests/compact_literals.phpt         |   4 ++--
 .../tests/compact_literals_collision.phpt       | Bin 252 -> 275 bytes
 ext/opcache/tests/exit_in_call_arg.phpt         |   2 ++
 ext/opcache/tests/fe_fetch_dce.phpt             |   2 ++
 ext/opcache/tests/func_info.phpt                |   4 ++--
 .../tests/get_configuration_matches_ini.phpt    |   4 ++--
 .../tests/internal_func_info_static_method.phpt |   6 ++----
 ext/opcache/tests/invalid_array_key_type.phpt   |   4 ++--
 ext/opcache/tests/invalid_new_dce.phpt          |   4 ++--
 ext/opcache/tests/is_script_cached.phpt         |   4 ++--
 ext/opcache/tests/issue0057.phpt                |   4 ++--
 ext/opcache/tests/issue0079.phpt                |   4 ++--
 ext/opcache/tests/issue0115.phpt                |   6 +++---
 ext/opcache/tests/issue0128.phpt                |   4 ++--
 ext/opcache/tests/issue0140.phpt                |   3 ++-
 ext/opcache/tests/issue0149.phpt                |   6 +++---
 ext/opcache/tests/issue0183.phpt                |   3 ++-
 .../tests/iterable_type_optimization.phpt       |   2 ++
 ext/opcache/tests/jit/array_elem.phpt           |   2 ++
 ext/opcache/tests/jit/assign_001.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_002.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_003.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_004.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_005.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_006.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_007.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_008.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_009.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_010.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_011.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_012.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_013.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_014.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_015.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_016.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_017.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_018.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_019.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_020.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_021.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_022.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_023.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_024.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_025.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_026.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_027.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_028.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_029.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_030.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_031.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_032.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_033.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_034.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_035.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_036.phpt           |   4 ++--
 ext/opcache/tests/jit/assign_dim_002.phpt       |   4 ++--
 ext/opcache/tests/jit/assign_dim_op_001.phpt    |   4 ++--
 .../tests/jit/assign_static_prop_001.phpt       |   4 ++--
 ext/opcache/tests/jit/bug77857.phpt             |   4 ++--
 ext/opcache/tests/jit/bug79358.phpt             |   2 ++
 ext/opcache/tests/jit/bug79888.phpt             |   4 ++--
 ext/opcache/tests/jit/bug80426.phpt             |   3 ++-
 ext/opcache/tests/jit/bug80447.phpt             |   4 ++--
 ext/opcache/tests/jit/bug80634.phpt             |   3 ++-
 ext/opcache/tests/jit/bug80742.phpt             |   2 ++
 ext/opcache/tests/jit/bug80745.phpt             |   4 ++--
 ext/opcache/tests/jit/bug80782.phpt             |   4 ++--
 ext/opcache/tests/jit/bug80786.phpt             |   2 ++
 ext/opcache/tests/jit/bug80802.phpt             |   4 ++--
 ext/opcache/tests/jit/bug80839.phpt             |   4 ++--
 ext/opcache/tests/jit/bug80861.phpt             |   4 ++--
 ext/opcache/tests/jit/cmp_001.phpt              |   4 ++--
 ext/opcache/tests/jit/cmp_002.phpt              |   4 ++--
 ext/opcache/tests/jit/cmp_003.phpt              |   4 ++--
 ext/opcache/tests/jit/cmp_004.phpt              |   4 ++--
 ext/opcache/tests/jit/const_001.phpt            |   4 ++--
 ext/opcache/tests/jit/count_001.phpt            |   4 ++--
 ext/opcache/tests/jit/defined_001.phpt          |   4 ++--
 .../tests/jit/fetch_dim_func_args_001.phpt      |   4 ++--
 ext/opcache/tests/jit/fetch_dim_r_001.phpt      |   4 ++--
 ext/opcache/tests/jit/fetch_dim_r_002.phpt      |   4 ++--
 ext/opcache/tests/jit/fetch_dim_r_003.phpt      |   4 ++--
 ext/opcache/tests/jit/fetch_dim_r_004.phpt      |   4 ++--
 ext/opcache/tests/jit/fetch_dim_rw_001.phpt     |   4 ++--
 ext/opcache/tests/jit/fetch_obj_001.phpt        |   4 ++--
 ext/opcache/tests/jit/fetch_obj_002.phpt        |   4 ++--
 ext/opcache/tests/jit/fetch_obj_003.phpt        |   4 ++--
 ext/opcache/tests/jit/fetch_obj_004.phpt        |   4 ++--
 ext/opcache/tests/jit/inc_001.phpt              |   4 ++--
 ext/opcache/tests/jit/inc_002.phpt              |   4 ++--
 ext/opcache/tests/jit/inc_003.phpt              |   4 ++--
 ext/opcache/tests/jit/inc_004.phpt              |   4 ++--
 ext/opcache/tests/jit/inc_005.phpt              |   4 ++--
 ext/opcache/tests/jit/inc_006.phpt              |   4 ++--
 ext/opcache/tests/jit/inc_007.phpt              |   4 ++--
 ext/opcache/tests/jit/inc_008.phpt              |   4 ++--
 ext/opcache/tests/jit/inc_009.phpt              |   4 ++--
 ext/opcache/tests/jit/inc_010.phpt              |   4 ++--
 ext/opcache/tests/jit/inc_011.phpt              |   4 ++--
 ext/opcache/tests/jit/inc_012.phpt              |   4 ++--
 ext/opcache/tests/jit/inc_013.phpt              |   4 ++--
 ext/opcache/tests/jit/inc_014.phpt              |   4 ++--
 ext/opcache/tests/jit/inc_015.phpt              |   4 ++--
 ext/opcache/tests/jit/inc_016.phpt              |   4 ++--
 ext/opcache/tests/jit/inc_017.phpt              |   4 ++--
 ext/opcache/tests/jit/inc_018.phpt              |   4 ++--
 ext/opcache/tests/jit/inc_019.phpt              |   4 ++--
 ext/opcache/tests/jit/inc_020.phpt              |   4 ++--
 ext/opcache/tests/jit/ini_leading_zero.phpt     |   4 ++--
 ext/opcache/tests/jit/jmpz_001.phpt             |   4 ++--
 ext/opcache/tests/jit/jmpz_ex_001.phpt          |   4 ++--
 ext/opcache/tests/jit/method_call_001.phpt      |   4 ++--
 ext/opcache/tests/jit/mod_001.phpt              |   4 ++--
 ext/opcache/tests/jit/mod_002.phpt              |   4 ++--
 ext/opcache/tests/jit/noval_001.phpt            |   4 ++--
 ext/opcache/tests/jit/recv_001.phpt             |   4 ++--
 ext/opcache/tests/jit/reg_alloc_001.phpt        |   4 ++--
 ext/opcache/tests/jit/reg_alloc_002.phpt        |   4 ++--
 ext/opcache/tests/jit/reg_alloc_003.phpt        |   4 ++--
 ext/opcache/tests/jit/send_ref_001.phpt         |   4 ++--
 ext/opcache/tests/jit/send_val_001.phpt         |   4 ++--
 ext/opcache/tests/jit/send_var_ex_001.phpt      |   4 ++--
 ext/opcache/tests/jit/shift_left_001.phpt       |   4 ++--
 ext/opcache/tests/jit/shift_left_002.phpt       |   4 ++--
 ext/opcache/tests/jit/shift_right_001.phpt      |   4 ++--
 ext/opcache/tests/jit/shift_right_002.phpt      |   4 ++--
 ext/opcache/tests/jit/shift_right_003.phpt      |   4 ++--
 ext/opcache/tests/jit/skipif.inc                |   3 ---
 ext/opcache/tests/jit/switch_jumptable.phpt     |   4 ++--
 ext/opcache/tests/jit/trampoline_001.phpt       |   4 ++--
 ext/opcache/tests/jit/trampoline_002.phpt       |   4 ++--
 ext/opcache/tests/jit/type_check_001.phpt       |   4 ++--
 ext/opcache/tests/jit/unreachable_block.phpt    |   4 ++--
 ext/opcache/tests/jmp_elim_001.phpt             |   3 ++-
 ext/opcache/tests/jmp_elim_002.phpt             |   4 ++--
 ext/opcache/tests/jmp_elim_003.phpt             |   4 ++--
 ext/opcache/tests/jmp_elim_004.phpt             |   4 ++--
 ext/opcache/tests/jmpz_jmp_elim.phpt            |   4 ++--
 ext/opcache/tests/leak_001.phpt                 |   4 ++--
 ext/opcache/tests/log_verbosity_bug.phpt        |   3 ++-
 ext/opcache/tests/match/001.phpt                |   4 ++--
 ext/opcache/tests/match/002.phpt                |   4 ++--
 ext/opcache/tests/match/003.phpt                |   4 ++--
 ext/opcache/tests/match/004.phpt                |   4 ++--
 ext/opcache/tests/method_call_on_literal.phpt   |   4 ++--
 ext/opcache/tests/neg_range_inference.phpt      |   4 ++--
 ext/opcache/tests/opt/block_pass_001.phpt       |   4 ++--
 ext/opcache/tests/opt/block_pass_002.phpt       |   4 ++--
 ext/opcache/tests/opt/coalesce.phpt             |   4 ++--
 ext/opcache/tests/opt/dce_001.phpt              |   4 ++--
 ext/opcache/tests/opt/dce_002.phpt              |   4 ++--
 ext/opcache/tests/opt/dce_003.phpt              |   4 ++--
 ext/opcache/tests/opt/dce_004.phpt              |   4 ++--
 ext/opcache/tests/opt/dce_005.phpt              |   4 ++--
 ext/opcache/tests/opt/dce_006.phpt              |   4 ++--
 ext/opcache/tests/opt/dce_007.phpt              |   4 ++--
 ext/opcache/tests/opt/dce_008.phpt              |   4 ++--
 ext/opcache/tests/opt/dce_009.phpt              |   4 ++--
 ext/opcache/tests/opt/jmp_001.phpt              |   4 ++--
 ext/opcache/tests/opt/nullsafe_001.phpt         |   4 ++--
 ext/opcache/tests/opt/nullsafe_002.phpt         |   4 ++--
 ext/opcache/tests/opt/prop_types.phpt           |   4 ++--
 ext/opcache/tests/opt/sccp_001.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_002.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_003.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_004.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_005.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_006.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_007.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_008.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_009.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_010.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_011.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_012.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_013.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_014.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_015.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_016.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_017.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_018.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_019.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_020.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_021.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_022.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_023.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_024.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_025.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_026.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_027.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_028.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_029.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_030.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_031.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_032.phpt             |   4 ++--
 ext/opcache/tests/opt/sccp_033.phpt             |   4 ++--
 ext/opcache/tests/opt/skipif.inc                |   3 ---
 ext/opcache/tests/opt/verify_return_type.phpt   |   4 ++--
 ext/opcache/tests/optimize_func_calls.phpt      |   4 ++--
 ext/opcache/tests/optimize_func_calls_001.phpt  |   4 ++--
 ext/opcache/tests/optimize_static_001.phpt      |   4 ++--
 ext/opcache/tests/phi_remove_001.phpt           |   4 ++--
 ext/opcache/tests/phi_remove_002.phpt           |   4 ++--
 ext/opcache/tests/phi_use_chain.phpt            |   2 ++
 ext/opcache/tests/preload_001.phpt              |   3 ++-
 ext/opcache/tests/preload_002.phpt              |   3 ++-
 ext/opcache/tests/preload_003.phpt              |   3 ++-
 ext/opcache/tests/preload_004.phpt              |   3 ++-
 ext/opcache/tests/preload_005.phpt              |   3 ++-
 ext/opcache/tests/preload_006.phpt              |   3 ++-
 ext/opcache/tests/preload_007.phpt              |   3 ++-
 ext/opcache/tests/preload_008.phpt              |   3 ++-
 ext/opcache/tests/preload_009.phpt              |   3 ++-
 ext/opcache/tests/preload_010.phpt              |   3 ++-
 ext/opcache/tests/preload_011.phpt              |   3 ++-
 ext/opcache/tests/preload_012.phpt              |   3 ++-
 ext/opcache/tests/preload_013.phpt              |   3 ++-
 ext/opcache/tests/preload_bug79114.phpt         |   3 ++-
 ext/opcache/tests/preload_class_alias.phpt      |   3 ++-
 ext/opcache/tests/preload_class_alias_2.phpt    |   3 ++-
 ext/opcache/tests/preload_dynamic_function.phpt |   3 ++-
 ext/opcache/tests/preload_early_binding.phpt    |   3 ++-
 ext/opcache/tests/preload_ind.phpt              |   3 ++-
 .../tests/preload_loadable_classes_1.phpt       |   3 ++-
 .../tests/preload_loadable_classes_2.phpt       |   3 ++-
 .../tests/preload_loadable_classes_3.phpt       |   3 ++-
 .../tests/preload_method_static_vars.phpt       |   3 ++-
 ext/opcache/tests/preload_parse_error.phpt      |   3 ++-
 ext/opcache/tests/preload_prop_info_table.phpt  |   3 ++-
 .../tests/preload_static_var_inheritance.phpt   |   3 ++-
 ext/opcache/tests/preload_trait_alias.phpt      |   3 ++-
 .../tests/preload_trait_multiple_fixup.phpt     |   3 ++-
 ext/opcache/tests/preload_trait_static.phpt     |   3 ++-
 .../tests/preload_unresolved_prop_type.phpt     |   3 ++-
 ext/opcache/tests/preload_windows.phpt          |   3 ++-
 ext/opcache/tests/revalidate_path_01.phpt       |   4 ++--
 ext/opcache/tests/send_unpack_empty_array.phpt  |   4 ++--
 ext/opcache/tests/skipif.inc                    |   3 ---
 ext/opcache/tests/ssa_bug_001.phpt              |   4 ++--
 ext/opcache/tests/ssa_bug_002.phpt              |   4 ++--
 ext/opcache/tests/ssa_bug_003.phpt              |   4 ++--
 ext/opcache/tests/ssa_bug_004.phpt              |   4 ++--
 ext/opcache/tests/ssa_bug_005.phpt              |   4 ++--
 ext/opcache/tests/ssa_bug_006.phpt              |   4 ++--
 ext/opcache/tests/ssa_bug_007.phpt              |   4 ++--
 ext/opcache/tests/ssa_bug_008.phpt              |   4 ++--
 ext/opcache/tests/ssa_bug_009.phpt              |   4 ++--
 ext/opcache/tests/ssa_bug_010.phpt              |   4 ++--
 ext/opcache/tests/ssa_bug_011.phpt              |   4 ++--
 .../tests/switch_with_coinciding_targets.phpt   |   4 ++--
 ext/opcache/tests/verify_return_dfg.phpt        |   4 ++--
 ext/opcache/tests/verify_return_instanceof.phpt |   2 ++
 ext/opcache/tests/warning_replay.phpt           |   2 ++
 ext/opcache/tests/wrong_inlining_001.phpt       |   4 ++--
 ext/opcache/tests/wrong_inlining_002.phpt       |   4 ++--
 ext/opcache/tests/wrong_inlining_003.phpt       |   4 ++--
 ext/opcache/tests/wrong_inlining_004.phpt       |   4 ++--
 ext/opcache/tests/wrong_inlining_005.phpt       |   4 ++--
 ext/opcache/tests/zzz_basic_logging.phpt        |   3 ++-
 ext/shmop/tests/001.phpt                        |   8 ++------
 ext/shmop/tests/002.phpt                        |   8 ++------
 ext/shmop/tests/shmop_open_private.phpt         |   6 ++----
 566 files changed, 1177 insertions(+), 1181 deletions(-)
 delete mode 100644 ext/ftp/tests/skipif.inc
 delete mode 100644 ext/iconv/tests/skipif.inc
 delete mode 100644 ext/opcache/tests/jit/skipif.inc
 delete mode 100644 ext/opcache/tests/opt/skipif.inc
 delete mode 100644 ext/opcache/tests/skipif.inc

diff --git a/ext/ftp/tests/001.phpt b/ext/ftp/tests/001.phpt
index 38475d3ffd3..4389924b2e7 100644
--- a/ext/ftp/tests/001.phpt
+++ b/ext/ftp/tests/001.phpt
@@ -1,9 +1,8 @@
 --TEST--
 FTP login
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/002.phpt b/ext/ftp/tests/002.phpt
index 6c74e51e49c..9e26f5ed59a 100644
--- a/ext/ftp/tests/002.phpt
+++ b/ext/ftp/tests/002.phpt
@@ -1,9 +1,11 @@
 --TEST--
 FTP login (SSL)
+--EXTENSIONS--
+ftp
+pcntl
+openssl
 --SKIPIF--
 <?php
-$ssl = 1;
-require 'skipif.inc';
 if (!function_exists("ftp_ssl_connect")) die("skip ftp_ssl is disabled");
 ?>
 --FILE--
diff --git a/ext/ftp/tests/003.phpt b/ext/ftp/tests/003.phpt
index db57ed56b7d..9d08e0a3c88 100644
--- a/ext/ftp/tests/003.phpt
+++ b/ext/ftp/tests/003.phpt
@@ -1,9 +1,8 @@
 --TEST--
 FTP cwd
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/004.phpt b/ext/ftp/tests/004.phpt
index e844f024ff3..a7ef2672a7e 100644
--- a/ext/ftp/tests/004.phpt
+++ b/ext/ftp/tests/004.phpt
@@ -1,9 +1,8 @@
 --TEST--
 FTP with bogus parameters
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/005.phpt b/ext/ftp/tests/005.phpt
index c1c749d08cd..409b60e1847 100644
--- a/ext/ftp/tests/005.phpt
+++ b/ext/ftp/tests/005.phpt
@@ -1,9 +1,8 @@
 --TEST--
 FTP with bogus server responses
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 $bogus = 1;
diff --git a/ext/ftp/tests/007.phpt b/ext/ftp/tests/007.phpt
index 1ae879f901e..71a706238c7 100644
--- a/ext/ftp/tests/007.phpt
+++ b/ext/ftp/tests/007.phpt
@@ -3,10 +3,9 @@ FTP with bogus resource
 --CREDITS--
 Michael Paul da Rosa <michael [at] michaelpaul [dot] com [dot] br>
 PHP TestFest Dublin 2017
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 $ftp = tmpfile();
diff --git a/ext/ftp/tests/bug27809.phpt b/ext/ftp/tests/bug27809.phpt
index ff9765c102b..f1143cd4cf9 100644
--- a/ext/ftp/tests/bug27809.phpt
+++ b/ext/ftp/tests/bug27809.phpt
@@ -1,9 +1,8 @@
 --TEST--
 Bug #27809 (ftp_systype returns null)
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 $bug27809=true;
diff --git a/ext/ftp/tests/bug37799.phpt b/ext/ftp/tests/bug37799.phpt
index e61d06f7436..44219b98a67 100644
--- a/ext/ftp/tests/bug37799.phpt
+++ b/ext/ftp/tests/bug37799.phpt
@@ -1,9 +1,11 @@
 --TEST--
 Bug #37799 (ftp_ssl_connect() falls back to non-ssl connection)
+--EXTENSIONS--
+ftp
+pcntl
+openssl
 --SKIPIF--
 <?php
-$ssl = 1;
-require 'skipif.inc';
 if (!function_exists("ftp_ssl_connect")) die("skip ftp_ssl is disabled");
 ?>
 --FILE--
diff --git a/ext/ftp/tests/bug39458-2.phpt b/ext/ftp/tests/bug39458-2.phpt
index 9e4be5d5ffb..3945055d541 100644
--- a/ext/ftp/tests/bug39458-2.phpt
+++ b/ext/ftp/tests/bug39458-2.phpt
@@ -1,9 +1,8 @@
 --TEST--
 Bug #39458 (ftp_nlist() returns false on empty directories (other server behaviour))
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 $bug39458=1;
diff --git a/ext/ftp/tests/bug39458.phpt b/ext/ftp/tests/bug39458.phpt
index 828664990e4..a2915fa3b98 100644
--- a/ext/ftp/tests/bug39458.phpt
+++ b/ext/ftp/tests/bug39458.phpt
@@ -1,9 +1,8 @@
 --TEST--
 Bug #39458 (ftp_nlist() returns false on empty directories)
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/bug39583-2.phpt b/ext/ftp/tests/bug39583-2.phpt
index 0a8423d3913..45ce8ac68d9 100644
--- a/ext/ftp/tests/bug39583-2.phpt
+++ b/ext/ftp/tests/bug39583-2.phpt
@@ -1,9 +1,8 @@
 --TEST--
 Bug #39583 (FTP always transfers in binary mode)
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/bug39583.phpt b/ext/ftp/tests/bug39583.phpt
index b3af56ec007..e39469fea7b 100644
--- a/ext/ftp/tests/bug39583.phpt
+++ b/ext/ftp/tests/bug39583.phpt
@@ -1,9 +1,8 @@
 --TEST--
 Bug #39583 (FTP always transfers in binary mode)
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 $bug39583=1;
diff --git a/ext/ftp/tests/bug7216-2.phpt b/ext/ftp/tests/bug7216-2.phpt
index 23ab8511996..69a2dcc3788 100644
--- a/ext/ftp/tests/bug7216-2.phpt
+++ b/ext/ftp/tests/bug7216-2.phpt
@@ -1,9 +1,8 @@
 --TEST--
 Bug #7216 (ftp_mkdir returns nothing (2))
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/bug7216.phpt b/ext/ftp/tests/bug7216.phpt
index 000bb1dede8..c6b50f62c0c 100644
--- a/ext/ftp/tests/bug7216.phpt
+++ b/ext/ftp/tests/bug7216.phpt
@@ -1,9 +1,8 @@
 --TEST--
 Bug #7216 (ftp_mkdir returns nothing)
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 $bug7216=true;
diff --git a/ext/ftp/tests/dead-resource.phpt b/ext/ftp/tests/dead-resource.phpt
index 75a9931d547..358ec11ed6c 100644
--- a/ext/ftp/tests/dead-resource.phpt
+++ b/ext/ftp/tests/dead-resource.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Attempt to use a closed FTPConnection
---SKIPIF--
-<?php
-require 'skipif.inc';
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/filesize_large.phpt b/ext/ftp/tests/filesize_large.phpt
index 05f12a3e5b8..aab3389c82f 100644
--- a/ext/ftp/tests/filesize_large.phpt
+++ b/ext/ftp/tests/filesize_large.phpt
@@ -1,8 +1,10 @@
 --TEST--
 Verify php can handle filesizes >32bit
+--EXTENSIONS--
+ftp
+pcntl
 --SKIPIF--
 <?php
-require 'skipif.inc';
 if (2147483647 == PHP_INT_MAX) {
     die('skip 64-bit only');
 }
diff --git a/ext/ftp/tests/ftp_alloc_basic1.phpt b/ext/ftp/tests/ftp_alloc_basic1.phpt
index c90f6e73fc9..1fc1584891a 100644
--- a/ext/ftp/tests/ftp_alloc_basic1.phpt
+++ b/ext/ftp/tests/ftp_alloc_basic1.phpt
@@ -3,10 +3,9 @@ Testing ftp_alloc returns true
 --CREDITS--
 Rodrigo Moyle <eu [at] rodrigorm [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_alloc_basic2.phpt b/ext/ftp/tests/ftp_alloc_basic2.phpt
index 41911e33969..a789fa08364 100644
--- a/ext/ftp/tests/ftp_alloc_basic2.phpt
+++ b/ext/ftp/tests/ftp_alloc_basic2.phpt
@@ -3,10 +3,9 @@ Testing ftp_alloc returns true
 --CREDITS--
 Rodrigo Moyle <eu [at] rodrigorm [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_append.phpt b/ext/ftp/tests/ftp_append.phpt
index 29b1f918e37..a1582accec9 100644
--- a/ext/ftp/tests/ftp_append.phpt
+++ b/ext/ftp/tests/ftp_append.phpt
@@ -1,9 +1,8 @@
 --TEST--
 ftp_append() create new file and append something
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_chmod_basic.phpt b/ext/ftp/tests/ftp_chmod_basic.phpt
index baaa25a9871..d56126a2244 100644
--- a/ext/ftp/tests/ftp_chmod_basic.phpt
+++ b/ext/ftp/tests/ftp_chmod_basic.phpt
@@ -3,10 +3,9 @@ Testing ftp_chmod returns file mode
 --CREDITS--
 Rodrigo Moyle <eu [at] rodrigorm [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_constructor.phpt b/ext/ftp/tests/ftp_constructor.phpt
index 881677f6a55..146df8436c1 100644
--- a/ext/ftp/tests/ftp_constructor.phpt
+++ b/ext/ftp/tests/ftp_constructor.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Attempt to instantiate an FTPConnection directly
---SKIPIF--
-<?php
-require 'skipif.inc';
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 
diff --git a/ext/ftp/tests/ftp_delete.phpt b/ext/ftp/tests/ftp_delete.phpt
index cb3c65e8ae3..97ce17956a0 100644
--- a/ext/ftp/tests/ftp_delete.phpt
+++ b/ext/ftp/tests/ftp_delete.phpt
@@ -4,8 +4,9 @@ Testing ftp_delete basic functionality
 Gabriel Caruso (carusogabriel34@gmail.com)
 Contributed by Ward Cappelle <wardcappelle@gmail.com>
 User Group: PHP-WVL & PHPGent #PHPTestFest
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_exec_basic.phpt b/ext/ftp/tests/ftp_exec_basic.phpt
index dbf7ce331f3..5db84009331 100644
--- a/ext/ftp/tests/ftp_exec_basic.phpt
+++ b/ext/ftp/tests/ftp_exec_basic.phpt
@@ -3,10 +3,9 @@ Testing ftp_exec returns true
 --CREDITS--
 Rodrigo Moyle <eu [at] rodrigorm [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_fget_basic.phpt b/ext/ftp/tests/ftp_fget_basic.phpt
index 62092f897d4..e2e0ac55405 100644
--- a/ext/ftp/tests/ftp_fget_basic.phpt
+++ b/ext/ftp/tests/ftp_fget_basic.phpt
@@ -2,10 +2,9 @@
 FTP ftp_fget file for both binary and ASCII transfer modes
 --CREDITS--
 Nathaniel McHugh
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_fget_basic1.phpt b/ext/ftp/tests/ftp_fget_basic1.phpt
index d104a3a0c59..caea41175f0 100644
--- a/ext/ftp/tests/ftp_fget_basic1.phpt
+++ b/ext/ftp/tests/ftp_fget_basic1.phpt
@@ -3,10 +3,9 @@ Testing ftp_fget ignore autoresume if autoseek is switched off
 --CREDITS--
 Rodrigo Moyle <eu [at] rodrigorm [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_fget_basic2.phpt b/ext/ftp/tests/ftp_fget_basic2.phpt
index 39a9ce8f0ce..a79f634f44d 100644
--- a/ext/ftp/tests/ftp_fget_basic2.phpt
+++ b/ext/ftp/tests/ftp_fget_basic2.phpt
@@ -3,10 +3,9 @@ Testing ftp_fget autoresume
 --CREDITS--
 Rodrigo Moyle <eu [at] rodrigorm [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_fget_basic3.phpt b/ext/ftp/tests/ftp_fget_basic3.phpt
index 88119b61f77..03ccb7f7f7e 100644
--- a/ext/ftp/tests/ftp_fget_basic3.phpt
+++ b/ext/ftp/tests/ftp_fget_basic3.phpt
@@ -3,10 +3,9 @@ Testing ftp_fget resume parameter
 --CREDITS--
 Rodrigo Moyle <eu [at] rodrigorm [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_fput.phpt b/ext/ftp/tests/ftp_fput.phpt
index 7d53283e3d9..23117e100b6 100644
--- a/ext/ftp/tests/ftp_fput.phpt
+++ b/ext/ftp/tests/ftp_fput.phpt
@@ -2,8 +2,9 @@
 Testing ftp_fput basic functionality
 --CREDITS--
 Gabriel Caruso (carusogabriel34@gmail.com)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_get_basic.phpt b/ext/ftp/tests/ftp_get_basic.phpt
index c52ea56218f..0ce3345266e 100644
--- a/ext/ftp/tests/ftp_get_basic.phpt
+++ b/ext/ftp/tests/ftp_get_basic.phpt
@@ -2,10 +2,9 @@
 FTP ftp_get file for both binary and ASCII transfer modes
 --CREDITS--
 Nathaniel McHugh
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_get_option.phpt b/ext/ftp/tests/ftp_get_option.phpt
index 13ed76fff15..496fceadffe 100644
--- a/ext/ftp/tests/ftp_get_option.phpt
+++ b/ext/ftp/tests/ftp_get_option.phpt
@@ -2,8 +2,9 @@
 Testing ftp_get_option basic functionality
 --CREDITS--
 Gabriel Caruso (carusogabriel34@gmail.com)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_mdtm_basic.phpt b/ext/ftp/tests/ftp_mdtm_basic.phpt
index a52593cbefe..88e12929afa 100644
--- a/ext/ftp/tests/ftp_mdtm_basic.phpt
+++ b/ext/ftp/tests/ftp_mdtm_basic.phpt
@@ -2,10 +2,9 @@
 Test the File Modification Time as described in http://tools.ietf.org/html/rfc3659#section-3.1
 --CREDITS--
 Nathaniel McHugh
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 
diff --git a/ext/ftp/tests/ftp_mlsd.phpt b/ext/ftp/tests/ftp_mlsd.phpt
index 85da6b8028f..6332ca8f571 100644
--- a/ext/ftp/tests/ftp_mlsd.phpt
+++ b/ext/ftp/tests/ftp_mlsd.phpt
@@ -1,9 +1,8 @@
 --TEST--
 ftp_mlsd() return parsed lines
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_mlsd_empty_directory.phpt b/ext/ftp/tests/ftp_mlsd_empty_directory.phpt
index d646d76a98a..81f2d3f8fcb 100644
--- a/ext/ftp/tests/ftp_mlsd_empty_directory.phpt
+++ b/ext/ftp/tests/ftp_mlsd_empty_directory.phpt
@@ -1,9 +1,8 @@
 --TEST--
 ftp_mlsd() must not return false on empty directories
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_mlsd_missing_directory.phpt b/ext/ftp/tests/ftp_mlsd_missing_directory.phpt
index 3656ef92f71..b35ebd31712 100644
--- a/ext/ftp/tests/ftp_mlsd_missing_directory.phpt
+++ b/ext/ftp/tests/ftp_mlsd_missing_directory.phpt
@@ -2,10 +2,9 @@
 Testing ftp_mlsd returns false on server error
 --CREDITS--
 Andreas Treichel <gmblar+github [at] gmail [dot] com>
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_nb_continue.phpt b/ext/ftp/tests/ftp_nb_continue.phpt
index 1275897919d..1628d2da4c3 100644
--- a/ext/ftp/tests/ftp_nb_continue.phpt
+++ b/ext/ftp/tests/ftp_nb_continue.phpt
@@ -1,9 +1,8 @@
 --TEST--
 Testing whether ftp_nb_continue() fetches more data
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_nb_fget_basic1.phpt b/ext/ftp/tests/ftp_nb_fget_basic1.phpt
index d5576f37106..a7e301c2951 100644
--- a/ext/ftp/tests/ftp_nb_fget_basic1.phpt
+++ b/ext/ftp/tests/ftp_nb_fget_basic1.phpt
@@ -3,10 +3,9 @@ Testing ftp_nb_fget ignore autoresume if autoseek is switched off
 --CREDITS--
 Rodrigo Moyle <eu [at] rodrigorm [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_nb_fget_basic2.phpt b/ext/ftp/tests/ftp_nb_fget_basic2.phpt
index 830e991c468..5d627461aeb 100644
--- a/ext/ftp/tests/ftp_nb_fget_basic2.phpt
+++ b/ext/ftp/tests/ftp_nb_fget_basic2.phpt
@@ -3,10 +3,9 @@ Testing ftp_nb_fget autoresume
 --CREDITS--
 Rodrigo Moyle <eu [at] rodrigorm [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_nb_fget_basic3.phpt b/ext/ftp/tests/ftp_nb_fget_basic3.phpt
index d62eb436445..169a6a17bde 100644
--- a/ext/ftp/tests/ftp_nb_fget_basic3.phpt
+++ b/ext/ftp/tests/ftp_nb_fget_basic3.phpt
@@ -3,10 +3,9 @@ Testing ftp_nb_fget resume parameter
 --CREDITS--
 Rodrigo Moyle <eu [at] rodrigorm [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_nb_fput.phpt b/ext/ftp/tests/ftp_nb_fput.phpt
index 1ec09283dd1..19054f233bd 100644
--- a/ext/ftp/tests/ftp_nb_fput.phpt
+++ b/ext/ftp/tests/ftp_nb_fput.phpt
@@ -2,8 +2,9 @@
 Testing ftp_nb_fput basic functionality
 --CREDITS--
 Gabriel Caruso (carusogabriel34@gmail.com)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_nb_get_large.phpt b/ext/ftp/tests/ftp_nb_get_large.phpt
index 8163677a4e9..2d0ca67bd31 100644
--- a/ext/ftp/tests/ftp_nb_get_large.phpt
+++ b/ext/ftp/tests/ftp_nb_get_large.phpt
@@ -1,8 +1,10 @@
 --TEST--
 Testing ftp_nb_fget can handle large files incl. resume
+--EXTENSIONS--
+ftp
+pcntl
 --SKIPIF--
 <?php
-require 'skipif.inc';
 if (2147483647 == PHP_INT_MAX) {
     die('skip ot supported on this system');
 }
diff --git a/ext/ftp/tests/ftp_nb_put.phpt b/ext/ftp/tests/ftp_nb_put.phpt
index 691c35aa461..caebd0f3d1e 100644
--- a/ext/ftp/tests/ftp_nb_put.phpt
+++ b/ext/ftp/tests/ftp_nb_put.phpt
@@ -2,8 +2,9 @@
 Testing ftp_nb_put basic functionality
 --CREDITS--
 Gabriel Caruso (carusogabriel34@gmail.com)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_pasv.phpt b/ext/ftp/tests/ftp_pasv.phpt
index 318f1ca72cd..9acc2470389 100644
--- a/ext/ftp/tests/ftp_pasv.phpt
+++ b/ext/ftp/tests/ftp_pasv.phpt
@@ -2,8 +2,9 @@
 Testing ftp_pasv basic funcionality
 --CREDITS--
 Gabriel Caruso (carusogabriel34@gmail.com)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_rawlist_basic1.phpt b/ext/ftp/tests/ftp_rawlist_basic1.phpt
index 5a706ad7106..2dc59bc40a6 100644
--- a/ext/ftp/tests/ftp_rawlist_basic1.phpt
+++ b/ext/ftp/tests/ftp_rawlist_basic1.phpt
@@ -2,8 +2,9 @@
 Testing ftp_rawlist basic functionality
 --CREDITS--
 Gabriel Caruso (carusogabriel34@gmail.com)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_rawlist_basic2.phpt b/ext/ftp/tests/ftp_rawlist_basic2.phpt
index 9ea9bd2865c..301875b1c67 100644
--- a/ext/ftp/tests/ftp_rawlist_basic2.phpt
+++ b/ext/ftp/tests/ftp_rawlist_basic2.phpt
@@ -3,10 +3,9 @@ Testing ftp_rawlist returns false on server error
 --CREDITS--
 Rodrigo Moyle <eu [at] rodrigorm [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_rename_basic1.phpt b/ext/ftp/tests/ftp_rename_basic1.phpt
index 3e1facc5038..d825a9c9197 100644
--- a/ext/ftp/tests/ftp_rename_basic1.phpt
+++ b/ext/ftp/tests/ftp_rename_basic1.phpt
@@ -1,9 +1,8 @@
 --TEST--
 FTP basic ftp_rename calls
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_rmdir_basic.phpt b/ext/ftp/tests/ftp_rmdir_basic.phpt
index 84063db05f9..0267dc6088a 100644
--- a/ext/ftp/tests/ftp_rmdir_basic.phpt
+++ b/ext/ftp/tests/ftp_rmdir_basic.phpt
@@ -3,10 +3,9 @@ Testing ftp_rmdir returns true
 --CREDITS--
 Rodrigo Moyle <eu [at] rodrigorm [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-require 'skipif.inc';
-?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_set_option.phpt b/ext/ftp/tests/ftp_set_option.phpt
index 675b4008f50..d4f16a03263 100644
--- a/ext/ftp/tests/ftp_set_option.phpt
+++ b/ext/ftp/tests/ftp_set_option.phpt
@@ -2,8 +2,9 @@
 Testing ftp_set_option basic functionality
 --CREDITS--
 Gabriel Caruso (carusogabriel34@gmail.com)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_set_option_errors.phpt b/ext/ftp/tests/ftp_set_option_errors.phpt
index 5e5ef328f31..3a43e8b7905 100644
--- a/ext/ftp/tests/ftp_set_option_errors.phpt
+++ b/ext/ftp/tests/ftp_set_option_errors.phpt
@@ -2,8 +2,9 @@
 Testing ftp_set_option errors while setting up
 --CREDITS--
 Gabriel Caruso (carusogabriel34@gmail.com)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_site_basic.phpt b/ext/ftp/tests/ftp_site_basic.phpt
index 7dfaf1a307a..eab71943ac8 100644
--- a/ext/ftp/tests/ftp_site_basic.phpt
+++ b/ext/ftp/tests/ftp_site_basic.phpt
@@ -2,8 +2,9 @@
 ftp_site function basic functionality
 --CREDITS--
 Gabriel Caruso (carusogabriel34@gmail.com)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+ftp
+pcntl
 --FILE--
 <?php
 require 'server.inc';
diff --git a/ext/ftp/tests/ftp_ssl_connect_error.phpt b/ext/ftp/tests/ftp_ssl_connect_error.phpt
index 61646293faa..ac64683e071 100644
--- a/ext/ftp/tests/ftp_ssl_connect_error.phpt
+++ b/ext/ftp/tests/ftp_ssl_connect_error.phpt
@@ -1,9 +1,11 @@
 --TEST--
 Test ftp_ssl_connect() function : error conditions
+--EXTENSIONS--
+ftp
+pcntl
+openssl
 --SKIPIF--
 <?php
-$ssl = 1;
-require 'skipif.inc';
 if (!function_exists("ftp_ssl_connect")) die("skip ftp_ssl is disabled");
 ?>
 --FILE--
diff --git a/ext/ftp/tests/skipif.inc b/ext/ftp/tests/skipif.inc
deleted file mode 100644
index 9ab6ad9856f..00000000000
--- a/ext/ftp/tests/skipif.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-if (!extension_loaded('ftp')) die('skip ftp extension not loaded');
-if (!function_exists('pcntl_fork')) die('skip fork not available');
-if (!empty($ssl) && !extension_loaded('openssl')) die('skip openssl extension not loaded');
-?>
diff --git a/ext/gmp/tests/002.phpt b/ext/gmp/tests/002.phpt
index 0fbc864ec60..e48496b3951 100644
--- a/ext/gmp/tests/002.phpt
+++ b/ext/gmp/tests/002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 GMP functionality test - factorial
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 function fact($x) {
diff --git a/ext/gmp/tests/003.phpt b/ext/gmp/tests/003.phpt
index 4705827dd22..8fdd723e8c4 100644
--- a/ext/gmp/tests/003.phpt
+++ b/ext/gmp/tests/003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for number base recognition
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
         /* Binary */
diff --git a/ext/gmp/tests/bug32773.phpt b/ext/gmp/tests/bug32773.phpt
index 6fd61e02a5c..a0977a14ec0 100644
--- a/ext/gmp/tests/bug32773.phpt
+++ b/ext/gmp/tests/bug32773.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #32773 (binary GMP functions returns unexpected value, when second parameter is int(0))
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 echo '10 + 0 = ', gmp_strval(gmp_add(10, 0)), "\n";
diff --git a/ext/gmp/tests/bug50175.phpt b/ext/gmp/tests/bug50175.phpt
index 4c12aad667f..34e4019cc7c 100644
--- a/ext/gmp/tests/bug50175.phpt
+++ b/ext/gmp/tests/bug50175.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #50175: gmp_init() results 0 on given base and number starting with 0x or 0b
---SKIPIF--
-<?php if (!extension_loaded('gmp')) die('skip gmp extension not loaded'); ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/bug50283.phpt b/ext/gmp/tests/bug50283.phpt
index 71e0f4fdba9..db0e456da0e 100644
--- a/ext/gmp/tests/bug50283.phpt
+++ b/ext/gmp/tests/bug50283.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Feature Request #50283 (allow base in gmp_strval to use full range: 2 to 62, and -2 to -36)
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 $a = gmp_init("0x41682179fbf5");
diff --git a/ext/gmp/tests/bug52906.phpt b/ext/gmp/tests/bug52906.phpt
index 7172ec3b4ec..a86120d1de0 100644
--- a/ext/gmp/tests/bug52906.phpt
+++ b/ext/gmp/tests/bug52906.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #52906 gmp_mod returns negative result when non-negative is expected
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/bug659967.phpt b/ext/gmp/tests/bug659967.phpt
index 6ba220274c4..c1b4877ded2 100644
--- a/ext/gmp/tests/bug659967.phpt
+++ b/ext/gmp/tests/bug659967.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #65997: Leak when using gc_collect_cycles with new GMP implementation
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/bug66872.phpt b/ext/gmp/tests/bug66872.phpt
index 785ab731218..3d65a910b78 100644
--- a/ext/gmp/tests/bug66872.phpt
+++ b/ext/gmp/tests/bug66872.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #66872: Crash when passing string to gmp_testbit
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/bug67917.phpt b/ext/gmp/tests/bug67917.phpt
index ce376349012..2f6b980b6b4 100644
--- a/ext/gmp/tests/bug67917.phpt
+++ b/ext/gmp/tests/bug67917.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #67917: Using GMP objects with overloaded operators can cause memory exhaustion
---SKIPIF--
-<?php if (!extension_loaded('gmp')) die('skip gmp extension not loaded'); ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/bug69803.phpt b/ext/gmp/tests/bug69803.phpt
index 32e52dbad0c..ad6cdd5f76e 100644
--- a/ext/gmp/tests/bug69803.phpt
+++ b/ext/gmp/tests/bug69803.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #69803: gmp_random_range() modifies second parameter if GMP number
---SKIPIF--
-<?php if (!extension_loaded('gmp')) die('skip gmp extension not loaded'); ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/bug70284.phpt b/ext/gmp/tests/bug70284.phpt
index 7dd2e37512e..d33fb51a4b2 100644
--- a/ext/gmp/tests/bug70284.phpt
+++ b/ext/gmp/tests/bug70284.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #70284 (Use after free vulnerability in unserialize() with GMP)
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/bug74670.phpt b/ext/gmp/tests/bug74670.phpt
index a28640b5c6e..5f9de9330e5 100644
--- a/ext/gmp/tests/bug74670.phpt
+++ b/ext/gmp/tests/bug74670.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #74670: Integer Underflow when unserializing GMP and possible other classes
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 $str = 'C:3:"GMP":4:{s:6666666666:""}';
diff --git a/ext/gmp/tests/bug80560.phpt b/ext/gmp/tests/bug80560.phpt
index bed82845fcb..25af4a42d9b 100644
--- a/ext/gmp/tests/bug80560.phpt
+++ b/ext/gmp/tests/bug80560.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #80560: Strings containing only a base prefix return 0 object
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/cast.phpt b/ext/gmp/tests/cast.phpt
index fe7e9a4664a..661a0159b94 100644
--- a/ext/gmp/tests/cast.phpt
+++ b/ext/gmp/tests/cast.phpt
@@ -1,7 +1,7 @@
 --TEST--
 GMP casting using casting operators
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/clone.phpt b/ext/gmp/tests/clone.phpt
index d4326d522aa..7a9fdbec76e 100644
--- a/ext/gmp/tests/clone.phpt
+++ b/ext/gmp/tests/clone.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Cloning GMP instances
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/comparison.phpt b/ext/gmp/tests/comparison.phpt
index 1f3a423267e..84c4ac68db3 100644
--- a/ext/gmp/tests/comparison.phpt
+++ b/ext/gmp/tests/comparison.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Overloaded GMP comparison in sort() etc
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/comparison_invalid.phpt b/ext/gmp/tests/comparison_invalid.phpt
index 8b68fb3ef67..e2d0688d0f8 100644
--- a/ext/gmp/tests/comparison_invalid.phpt
+++ b/ext/gmp/tests/comparison_invalid.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Invalid comparison with a GMP object
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_abs.phpt b/ext/gmp/tests/gmp_abs.phpt
index 73fc840c9f4..23fac5be5de 100644
--- a/ext/gmp/tests/gmp_abs.phpt
+++ b/ext/gmp/tests/gmp_abs.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_abs() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_and.phpt b/ext/gmp/tests/gmp_and.phpt
index 2bd7deeff07..f2356dc835a 100644
--- a/ext/gmp/tests/gmp_and.phpt
+++ b/ext/gmp/tests/gmp_and.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_and() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_binomial.phpt b/ext/gmp/tests/gmp_binomial.phpt
index eadf175ac9e..4598a4c47ee 100644
--- a/ext/gmp/tests/gmp_binomial.phpt
+++ b/ext/gmp/tests/gmp_binomial.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_binomial(): Binomial coefficients
---SKIPIF--
-<?php if (!extension_loaded('gmp')) die('skip gmp extension not loaded'); ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_clrbit.phpt b/ext/gmp/tests/gmp_clrbit.phpt
index 7bcf6969e9d..7ed301b9db0 100644
--- a/ext/gmp/tests/gmp_clrbit.phpt
+++ b/ext/gmp/tests/gmp_clrbit.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_clrbit() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_cmp.phpt b/ext/gmp/tests/gmp_cmp.phpt
index 45ca865dc63..f84bcfe9f52 100644
--- a/ext/gmp/tests/gmp_cmp.phpt
+++ b/ext/gmp/tests/gmp_cmp.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_cmp() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_com.phpt b/ext/gmp/tests/gmp_com.phpt
index 1b0a0a20971..344903a13c3 100644
--- a/ext/gmp/tests/gmp_com.phpt
+++ b/ext/gmp/tests/gmp_com.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_com() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_div_q.phpt b/ext/gmp/tests/gmp_div_q.phpt
index a9adeab24ce..c3bc4f37097 100644
--- a/ext/gmp/tests/gmp_div_q.phpt
+++ b/ext/gmp/tests/gmp_div_q.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_div_q() tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_div_qr.phpt b/ext/gmp/tests/gmp_div_qr.phpt
index a31c39c731c..a5e6af87633 100644
--- a/ext/gmp/tests/gmp_div_qr.phpt
+++ b/ext/gmp/tests/gmp_div_qr.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_div_qr() tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_div_r.phpt b/ext/gmp/tests/gmp_div_r.phpt
index 2372474bc89..47d43dfcedc 100644
--- a/ext/gmp/tests/gmp_div_r.phpt
+++ b/ext/gmp/tests/gmp_div_r.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_div_r() tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_divexact.phpt b/ext/gmp/tests/gmp_divexact.phpt
index 15182bbbee7..ced6dc34836 100644
--- a/ext/gmp/tests/gmp_divexact.phpt
+++ b/ext/gmp/tests/gmp_divexact.phpt
@@ -1,8 +1,9 @@
 --TEST--
 gmp_divexact() tests
+--EXTENSIONS--
+gmp
 --SKIPIF--
 <?php
-if (!extension_loaded("gmp")) die ("skip");
 if (!defined('GMP_VERSION') || version_compare("4.2.1", GMP_VERSION, ">=")) {
     die("skip your GMP is too old and will crash");
 }
diff --git a/ext/gmp/tests/gmp_export.phpt b/ext/gmp/tests/gmp_export.phpt
index cea9b4e502e..085bafbbcc3 100644
--- a/ext/gmp/tests/gmp_export.phpt
+++ b/ext/gmp/tests/gmp_export.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_export() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) echo "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_fact.phpt b/ext/gmp/tests/gmp_fact.phpt
index dd3b75a17f0..ce7331f6104 100644
--- a/ext/gmp/tests/gmp_fact.phpt
+++ b/ext/gmp/tests/gmp_fact.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_fact() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_gcd.phpt b/ext/gmp/tests/gmp_gcd.phpt
index 4e130a1fd90..3ad5b5e3c51 100644
--- a/ext/gmp/tests/gmp_gcd.phpt
+++ b/ext/gmp/tests/gmp_gcd.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_gcd() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_gcdext.phpt b/ext/gmp/tests/gmp_gcdext.phpt
index 0f4b23af7d9..530e0cb24c9 100644
--- a/ext/gmp/tests/gmp_gcdext.phpt
+++ b/ext/gmp/tests/gmp_gcdext.phpt
@@ -1,8 +1,7 @@
 --TEST--
 gmp_gcdext() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip";
-?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_hamdist.phpt b/ext/gmp/tests/gmp_hamdist.phpt
index 8e216e39a08..26de0f5a46e 100644
--- a/ext/gmp/tests/gmp_hamdist.phpt
+++ b/ext/gmp/tests/gmp_hamdist.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_hamdist() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_import.phpt b/ext/gmp/tests/gmp_import.phpt
index 026ab079d56..6292738b554 100644
--- a/ext/gmp/tests/gmp_import.phpt
+++ b/ext/gmp/tests/gmp_import.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_import() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) echo "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_init.phpt b/ext/gmp/tests/gmp_init.phpt
index 630b73013e3..6ca421b3e86 100644
--- a/ext/gmp/tests/gmp_init.phpt
+++ b/ext/gmp/tests/gmp_init.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_init() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_init_integer_notations.phpt b/ext/gmp/tests/gmp_init_integer_notations.phpt
index 0a705f7cd35..7b3e1da6c62 100644
--- a/ext/gmp/tests/gmp_init_integer_notations.phpt
+++ b/ext/gmp/tests/gmp_init_integer_notations.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_init() with various integer notations
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_intval.phpt b/ext/gmp/tests/gmp_intval.phpt
index 6fcb351404c..1d427e0e9c7 100644
--- a/ext/gmp/tests/gmp_intval.phpt
+++ b/ext/gmp/tests/gmp_intval.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_intval() tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_invert.phpt b/ext/gmp/tests/gmp_invert.phpt
index 888802f25dd..c295048185b 100644
--- a/ext/gmp/tests/gmp_invert.phpt
+++ b/ext/gmp/tests/gmp_invert.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_invert() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_jacobi.phpt b/ext/gmp/tests/gmp_jacobi.phpt
index da95b805fac..59fab662fa8 100644
--- a/ext/gmp/tests/gmp_jacobi.phpt
+++ b/ext/gmp/tests/gmp_jacobi.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_jacobi() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_kronecker.phpt b/ext/gmp/tests/gmp_kronecker.phpt
index 355d7d22569..0a8f1a5430d 100644
--- a/ext/gmp/tests/gmp_kronecker.phpt
+++ b/ext/gmp/tests/gmp_kronecker.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_kronecker(): Kronecker symbol
---SKIPIF--
-<?php if (!extension_loaded('gmp')) die('skip gmp extension not loaded'); ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_lcm.phpt b/ext/gmp/tests/gmp_lcm.phpt
index 6e2d1e88076..2f729a73233 100644
--- a/ext/gmp/tests/gmp_lcm.phpt
+++ b/ext/gmp/tests/gmp_lcm.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_lcm(): Least common multiple
---SKIPIF--
-<?php if (!extension_loaded('gmp')) die('skip gmp extension not loaded'); ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_legendre.phpt b/ext/gmp/tests/gmp_legendre.phpt
index fb8ad084238..4955558281d 100644
--- a/ext/gmp/tests/gmp_legendre.phpt
+++ b/ext/gmp/tests/gmp_legendre.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_legendre() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_mod.phpt b/ext/gmp/tests/gmp_mod.phpt
index 29cddf3ff6c..8581e66376f 100644
--- a/ext/gmp/tests/gmp_mod.phpt
+++ b/ext/gmp/tests/gmp_mod.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_mod tests()
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_neg.phpt b/ext/gmp/tests/gmp_neg.phpt
index 87ef950c820..6a7177a6ed3 100644
--- a/ext/gmp/tests/gmp_neg.phpt
+++ b/ext/gmp/tests/gmp_neg.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_neg() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_nextprime.phpt b/ext/gmp/tests/gmp_nextprime.phpt
index 004a099e807..b907d7a84e9 100644
--- a/ext/gmp/tests/gmp_nextprime.phpt
+++ b/ext/gmp/tests/gmp_nextprime.phpt
@@ -1,8 +1,7 @@
 --TEST--
 gmp_nextprime()
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip";
-?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_or.phpt b/ext/gmp/tests/gmp_or.phpt
index 5a4059c8645..a51a06a09ca 100644
--- a/ext/gmp/tests/gmp_or.phpt
+++ b/ext/gmp/tests/gmp_or.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_or() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_perfect_power.phpt b/ext/gmp/tests/gmp_perfect_power.phpt
index 8c316bd2c9f..d784cba1446 100644
--- a/ext/gmp/tests/gmp_perfect_power.phpt
+++ b/ext/gmp/tests/gmp_perfect_power.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_perfect_power(): Check if number is a perfect power
---SKIPIF--
-<?php if (!extension_loaded('gmp')) die('skip gmp extension not loaded'); ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_perfect_square.phpt b/ext/gmp/tests/gmp_perfect_square.phpt
index f96f39091f3..16fca508bff 100644
--- a/ext/gmp/tests/gmp_perfect_square.phpt
+++ b/ext/gmp/tests/gmp_perfect_square.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_perfect_square() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_php_int_max.phpt b/ext/gmp/tests/gmp_php_int_max.phpt
index 1f680a14901..a4974dac605 100644
--- a/ext/gmp/tests/gmp_php_int_max.phpt
+++ b/ext/gmp/tests/gmp_php_int_max.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PHP_INT_MAX tests
+--EXTENSIONS--
+gmp
 --SKIPIF--
 <?php
-if (!extension_loaded("gmp")) print "skip";
 if (PHP_INT_SIZE != 8) print "skip";
 ?>
 --FILE--
diff --git a/ext/gmp/tests/gmp_popcount.phpt b/ext/gmp/tests/gmp_popcount.phpt
index ddd1c2434c2..3b61eec5b7a 100644
--- a/ext/gmp/tests/gmp_popcount.phpt
+++ b/ext/gmp/tests/gmp_popcount.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_popcount() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_pow.phpt b/ext/gmp/tests/gmp_pow.phpt
index ab87e7f0933..f42e44e31ab 100644
--- a/ext/gmp/tests/gmp_pow.phpt
+++ b/ext/gmp/tests/gmp_pow.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_pow() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_pow2.phpt b/ext/gmp/tests/gmp_pow2.phpt
index e1007e8d4d6..43bf9bb5aaa 100644
--- a/ext/gmp/tests/gmp_pow2.phpt
+++ b/ext/gmp/tests/gmp_pow2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test pow() with gmp object
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_pown.phpt b/ext/gmp/tests/gmp_pown.phpt
index 49bc308e156..0e7b3bd1fa5 100644
--- a/ext/gmp/tests/gmp_pown.phpt
+++ b/ext/gmp/tests/gmp_pown.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_powm() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_prob_prime.phpt b/ext/gmp/tests/gmp_prob_prime.phpt
index be8a8d0f685..7c93a48bd93 100644
--- a/ext/gmp/tests/gmp_prob_prime.phpt
+++ b/ext/gmp/tests/gmp_prob_prime.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_prob_prime() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_random_bits.phpt b/ext/gmp/tests/gmp_random_bits.phpt
index 9c2f5be2e53..3dbfc097d28 100644
--- a/ext/gmp/tests/gmp_random_bits.phpt
+++ b/ext/gmp/tests/gmp_random_bits.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_random_bits() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_random_range.phpt b/ext/gmp/tests/gmp_random_range.phpt
index bd5ee688f0a..ae87dbd82b1 100644
--- a/ext/gmp/tests/gmp_random_range.phpt
+++ b/ext/gmp/tests/gmp_random_range.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_random_range() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_random_seed.phpt b/ext/gmp/tests/gmp_random_seed.phpt
index 4b505bfde3d..bfb45739f54 100644
--- a/ext/gmp/tests/gmp_random_seed.phpt
+++ b/ext/gmp/tests/gmp_random_seed.phpt
@@ -1,7 +1,8 @@
 --TEST--
 gmp_random_seed() basic tests
+--EXTENSIONS--
+gmp
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
 <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?>
 --FILE--
 <?php
diff --git a/ext/gmp/tests/gmp_remroot.phpt b/ext/gmp/tests/gmp_remroot.phpt
index 969182f37e0..8e53858c604 100644
--- a/ext/gmp/tests/gmp_remroot.phpt
+++ b/ext/gmp/tests/gmp_remroot.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_rootrem() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_root.phpt b/ext/gmp/tests/gmp_root.phpt
index e50990a4f68..2313b207cc8 100644
--- a/ext/gmp/tests/gmp_root.phpt
+++ b/ext/gmp/tests/gmp_root.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_root() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_scan0.phpt b/ext/gmp/tests/gmp_scan0.phpt
index c949f6a3bee..c850b1fe8dd 100644
--- a/ext/gmp/tests/gmp_scan0.phpt
+++ b/ext/gmp/tests/gmp_scan0.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_scan0() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_scan1.phpt b/ext/gmp/tests/gmp_scan1.phpt
index d625f0cb863..04f153a6eb9 100644
--- a/ext/gmp/tests/gmp_scan1.phpt
+++ b/ext/gmp/tests/gmp_scan1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_scan1() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_setbit.phpt b/ext/gmp/tests/gmp_setbit.phpt
index 6dad79f5d3b..b00393faf97 100644
--- a/ext/gmp/tests/gmp_setbit.phpt
+++ b/ext/gmp/tests/gmp_setbit.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_setbit() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_setbit_long.phpt b/ext/gmp/tests/gmp_setbit_long.phpt
index a967a80d76f..08927e9a2ee 100644
--- a/ext/gmp/tests/gmp_setbit_long.phpt
+++ b/ext/gmp/tests/gmp_setbit_long.phpt
@@ -1,8 +1,9 @@
 --TEST--
 gmp_setbit() with large index
+--EXTENSIONS--
+gmp
 --SKIPIF--
 <?php if (getenv("TRAVIS") === "true") die("skip not suitable for Travis-CI"); ?>
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
 <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?>
 <?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); ?>
 <?php
diff --git a/ext/gmp/tests/gmp_sign.phpt b/ext/gmp/tests/gmp_sign.phpt
index 125b64fcb1a..56706b20eda 100644
--- a/ext/gmp/tests/gmp_sign.phpt
+++ b/ext/gmp/tests/gmp_sign.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_sign() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_sqrt.phpt b/ext/gmp/tests/gmp_sqrt.phpt
index dcd9c58373d..50da298161c 100644
--- a/ext/gmp/tests/gmp_sqrt.phpt
+++ b/ext/gmp/tests/gmp_sqrt.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_sqrt() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_sqrtrem.phpt b/ext/gmp/tests/gmp_sqrtrem.phpt
index b415711bd4f..915fc4ed2f9 100644
--- a/ext/gmp/tests/gmp_sqrtrem.phpt
+++ b/ext/gmp/tests/gmp_sqrtrem.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_sqrtrem() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_strict_types.phpt b/ext/gmp/tests/gmp_strict_types.phpt
index e697afa6753..a63f2ef5059 100644
--- a/ext/gmp/tests/gmp_strict_types.phpt
+++ b/ext/gmp/tests/gmp_strict_types.phpt
@@ -1,5 +1,7 @@
 --TEST--
 GMP functions with strict_types=1
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_strval.phpt b/ext/gmp/tests/gmp_strval.phpt
index b03f0bcba10..a4d0a9b149b 100644
--- a/ext/gmp/tests/gmp_strval.phpt
+++ b/ext/gmp/tests/gmp_strval.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_strval() tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_sub.phpt b/ext/gmp/tests/gmp_sub.phpt
index feec6cc0170..5161bce1035 100644
--- a/ext/gmp/tests/gmp_sub.phpt
+++ b/ext/gmp/tests/gmp_sub.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_sub() tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_testbit.phpt b/ext/gmp/tests/gmp_testbit.phpt
index 30fc054c6c7..b787832f1cd 100644
--- a/ext/gmp/tests/gmp_testbit.phpt
+++ b/ext/gmp/tests/gmp_testbit.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_testbit() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_xor.phpt b/ext/gmp/tests/gmp_xor.phpt
index a6a5b170ac7..fdc8a67562c 100644
--- a/ext/gmp/tests/gmp_xor.phpt
+++ b/ext/gmp/tests/gmp_xor.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_xor() basic tests
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/overloading.phpt b/ext/gmp/tests/overloading.phpt
index 75eafa3ee5b..a0e5b1b971a 100644
--- a/ext/gmp/tests/overloading.phpt
+++ b/ext/gmp/tests/overloading.phpt
@@ -1,7 +1,7 @@
 --TEST--
 GMP operator overloading
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/serialize.phpt b/ext/gmp/tests/serialize.phpt
index dedd1507252..e54530107ea 100644
--- a/ext/gmp/tests/serialize.phpt
+++ b/ext/gmp/tests/serialize.phpt
@@ -1,7 +1,7 @@
 --TEST--
 GMP serialization and unserialization
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/surprising_integer_literals.phpt b/ext/gmp/tests/surprising_integer_literals.phpt
index de7289ea0bf..a4578f7afb5 100644
--- a/ext/gmp/tests/surprising_integer_literals.phpt
+++ b/ext/gmp/tests/surprising_integer_literals.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Surprising result with integer literals (hex/binary/octal)
---SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/unserialize_with_reference.phpt b/ext/gmp/tests/unserialize_with_reference.phpt
index a8f95e5339f..407fc1e0836 100644
--- a/ext/gmp/tests/unserialize_with_reference.phpt
+++ b/ext/gmp/tests/unserialize_with_reference.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Unserialize GMP instance with internal reference to itself
---SKIPIF--
-<?php if (!extension_loaded('gmp')) die('skip gmp extension not loaded'); ?>
+--EXTENSIONS--
+gmp
 --FILE--
 <?php
 $s = 'C:3:"GMP":23:{s:1:"2";a:1:{i:46;R:1;}}';
diff --git a/ext/iconv/tests/bug37176.phpt b/ext/iconv/tests/bug37176.phpt
index d1da176b6a1..7fd84631fcc 100644
--- a/ext/iconv/tests/bug37176.phpt
+++ b/ext/iconv/tests/bug37176.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #37176 (iconv_strpos() fails to find a string)
+--EXTENSIONS--
+iconv
 --SKIPIF--
 <?php
-include('skipif.inc');
 
 $test = @iconv_strpos("abbttt","ttt",0,"UTF-8");
 if ($test === false) {
diff --git a/ext/iconv/tests/bug37773.phpt b/ext/iconv/tests/bug37773.phpt
index 3b520c6e022..4dcdd56b3cb 100644
--- a/ext/iconv/tests/bug37773.phpt
+++ b/ext/iconv/tests/bug37773.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #37773 (iconv_substr() gives "Unknown error" when string length = 1")
+--EXTENSIONS--
+iconv
 --SKIPIF--
 <?php
-include('skipif.inc');
 
 $test = @iconv_strpos("abbttt","ttt",0,"UTF-8");
 if ($test === false) {
diff --git a/ext/iconv/tests/bug48147.phpt b/ext/iconv/tests/bug48147.phpt
index 342f920093b..ce304eecfb3 100644
--- a/ext/iconv/tests/bug48147.phpt
+++ b/ext/iconv/tests/bug48147.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #48147 (iconv with //IGNORE cuts the string)
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 $text = "aa\xC3\xC3\xC3\xB8aa";
diff --git a/ext/iconv/tests/bug48289.phpt b/ext/iconv/tests/bug48289.phpt
index f87364873d6..32d93f2defb 100644
--- a/ext/iconv/tests/bug48289.phpt
+++ b/ext/iconv/tests/bug48289.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #48289 (iconv_mime_encode() quoted-printable scheme is broken)
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 $text = "\xE3\x83\x86\xE3\x82\xB9\xE3\x83\x88\xE3\x83\x86\xE3\x82\xB9\xE3\x83\x88";
diff --git a/ext/iconv/tests/bug51250.phpt b/ext/iconv/tests/bug51250.phpt
index fd2e53b97a2..9cd2f3e349e 100644
--- a/ext/iconv/tests/bug51250.phpt
+++ b/ext/iconv/tests/bug51250.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #51250 (iconv_mime_decode() does not ignore malformed Q-encoded words)
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 $m = ICONV_MIME_DECODE_CONTINUE_ON_ERROR;
diff --git a/ext/iconv/tests/bug52211.phpt b/ext/iconv/tests/bug52211.phpt
index f4fe747cde8..f213c764de8 100644
--- a/ext/iconv/tests/bug52211.phpt
+++ b/ext/iconv/tests/bug52211.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #52211 (iconv() returns part of string on error)
---SKIPIF--
-<?php
-include('skipif.inc');
-?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 
diff --git a/ext/iconv/tests/bug52941.phpt b/ext/iconv/tests/bug52941.phpt
index b336d40c4b6..506fe1969a7 100644
--- a/ext/iconv/tests/bug52941.phpt
+++ b/ext/iconv/tests/bug52941.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #52941 (The 'iconv_mime_decode_headers' function is skipping headers)
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 $headers = <<<HEADERS
diff --git a/ext/iconv/tests/bug53304.phpt b/ext/iconv/tests/bug53304.phpt
index 7eb6c4109c2..465978cf7b8 100644
--- a/ext/iconv/tests/bug53304.phpt
+++ b/ext/iconv/tests/bug53304.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #53304 (quot_print_decode does not handle lower-case hex digits)
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 echo iconv_mime_decode('=?utf-8?Q?Nachricht_=c3=bcber_Kontaktformular_www.inexio.net?=', 0, 'UTF-8') . "\n";
diff --git a/ext/iconv/tests/bug53891.phpt b/ext/iconv/tests/bug53891.phpt
index aa359ef3861..57a4b69290b 100644
--- a/ext/iconv/tests/bug53891.phpt
+++ b/ext/iconv/tests/bug53891.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #53891 (iconv_mime_encode() fails to Q-encode UTF-8 string)
---SKIPIF--
-<?php
-if (!extension_loaded('iconv')) die('skip iconv extension not available');
-?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 $preferences = array(
diff --git a/ext/iconv/tests/bug55146.phpt b/ext/iconv/tests/bug55146.phpt
index 2583ac75780..4177909419d 100644
--- a/ext/iconv/tests/bug55146.phpt
+++ b/ext/iconv/tests/bug55146.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #55146 (iconv_mime_decode_headers() skips some headers)
---SKIPIF--
-<?php
-if (!extension_loaded('iconv')) die('skip iconv extension not available');
-?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 
diff --git a/ext/iconv/tests/bug60494.phpt b/ext/iconv/tests/bug60494.phpt
index d3038233884..bd0629ded22 100644
--- a/ext/iconv/tests/bug60494.phpt
+++ b/ext/iconv/tests/bug60494.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #60494 (iconv_mime_decode does ignore special characters)
---SKIPIF--
-<?php
-if (!extension_loaded('iconv')) die('skip iconv extension not available');
-?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 var_dump(iconv_mime_decode('ä'));
diff --git a/ext/iconv/tests/bug63839.phpt b/ext/iconv/tests/bug63839.phpt
index e137a0cb4be..0f5af9c2b01 100644
--- a/ext/iconv/tests/bug63839.phpt
+++ b/ext/iconv/tests/bug63839.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #63839 (iconv_mime_decode_headers function is skipping headers)
---SKIPIF--
-<?php
-if (!extension_loaded('iconv')) die('skip iconv extension not available');
-?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 $headers = 'From: "xyz" <xyz@xyz.com>
diff --git a/ext/iconv/tests/bug66828.phpt b/ext/iconv/tests/bug66828.phpt
index 1d6f47dc75c..25e1b3309eb 100644
--- a/ext/iconv/tests/bug66828.phpt
+++ b/ext/iconv/tests/bug66828.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #66828 (iconv_mime_encode Q-encoding longer than it should be)
---SKIPIF--
-<?php
-if (!extension_loaded('iconv')) die('skip iconv extension not available');
-?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 $preferences = array(
diff --git a/ext/iconv/tests/bug68180.phpt b/ext/iconv/tests/bug68180.phpt
index a6d64f22ce6..e42f134cc5e 100644
--- a/ext/iconv/tests/bug68180.phpt
+++ b/ext/iconv/tests/bug68180.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #68180 (iconv_mime_decode can return extra characters in a header)
---SKIPIF--
-<?php
-if (!extension_loaded('iconv')) die('skip iconv extension not available');
-?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 $original = "=?UTF-8?Q?=E3=80=8E=E3=80=90=E5=A4=96=E8=B3=87=E7=B3=BB=E6=88=A6=E7=95=A5=E3=82=B3=E3=83=B3=E3=82=B5=E3=83=AB=E3=81=8C=E9=9B=86=E7=B5=90=E3=80=91=E3=83=88=E3=83=83=E3=83=97=E3=82=B3=E3=83=B3=E3=82=B5=E3=83=AB=E3=82=BF=E3=83=B3=E3=83=88=E3=81=A8=E8=A9=B1=E3=81=9B=E3=82=8B=E3=82=B3=E3=83=B3=E3=82=B5=E3=83=AB=E6=A5=AD=E7=95=8C=E7=A0=94=E7=A9=B6=E3=82=BB=E3=83=9F=E3=83=8A=E3=83=BC=E3=80=8F=E3=81=B8=E3=81=AE=E3=82=A8=E3=83=B3=E3=83=88=E3=83=AA=E3=83=BC=E3=81=82=E3=82=8A=E3=81=8C=E3=81=A8=E3=81=86=E3=81=94=E3=81=96=E3=81=84=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?=";
diff --git a/ext/iconv/tests/bug69840.phpt b/ext/iconv/tests/bug69840.phpt
index 93bda9a731d..4d3bc30e017 100644
--- a/ext/iconv/tests/bug69840.phpt
+++ b/ext/iconv/tests/bug69840.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #69840 (iconv_substr() doesn't work with UTF-16BE)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 $str = iconv_substr("a\x00b\x00", 0, 1, 'UTF-16LE');
diff --git a/ext/iconv/tests/bug72320.phpt b/ext/iconv/tests/bug72320.phpt
index 0c83d33db03..ef1638ca5ff 100644
--- a/ext/iconv/tests/bug72320.phpt
+++ b/ext/iconv/tests/bug72320.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #72320 (iconv_substr returns false for empty strings)
---SKIPIF--
-<?php
-if (!extension_loaded('iconv')) die('skip ext/iconv required');
-?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 var_dump(iconv_substr('', 0, 10, 'UTF-8'));
diff --git a/ext/iconv/tests/bug76249.phpt b/ext/iconv/tests/bug76249.phpt
index 9d8a0f3e9f3..37608ccc044 100644
--- a/ext/iconv/tests/bug76249.phpt
+++ b/ext/iconv/tests/bug76249.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #76249 (stream filter convert.iconv leads to infinite loop on invalid sequence)
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 $fh = fopen('php://memory', 'rw');
diff --git a/ext/iconv/tests/bug77147.phpt b/ext/iconv/tests/bug77147.phpt
index 4f091d3ede2..39fb2f60282 100644
--- a/ext/iconv/tests/bug77147.phpt
+++ b/ext/iconv/tests/bug77147.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #77147 (Fixing 60494 ignored ICONV_MIME_DECODE_CONTINUE_ON_ERROR)
---SKIPIF--
-<?php
-if (!extension_loaded('iconv')) die('skip iconv extension not available');
-?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 $string = <<<EOF
diff --git a/ext/iconv/tests/bug78069.phpt b/ext/iconv/tests/bug78069.phpt
index 1341a5ef4f7..88cf6e35f82 100644
--- a/ext/iconv/tests/bug78069.phpt
+++ b/ext/iconv/tests/bug78069.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #78069 (Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow)
---SKIPIF--
-<?php
-if (!extension_loaded('iconv')) die('skip ext/iconv required');
-?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 $hdr = iconv_mime_decode_headers(file_get_contents(__DIR__ . "/bug78069.data"),2);
diff --git a/ext/iconv/tests/bug79200.phpt b/ext/iconv/tests/bug79200.phpt
index e8d86086a32..e7b8c9d6130 100644
--- a/ext/iconv/tests/bug79200.phpt
+++ b/ext/iconv/tests/bug79200.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #79200 (Some iconv functions cut Windows-1258)
---SKIPIF--
-<?php
-if (!extension_loaded('iconv')) die('skip iconv extension not available');
-?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 var_dump(iconv_mime_decode('=?windows-1258?Q?test=20test?=', 0, 'UTF-8'));
diff --git a/ext/iconv/tests/eucjp2iso2022jp.phpt b/ext/iconv/tests/eucjp2iso2022jp.phpt
index 30ff76e514d..6c1a8ec1214 100644
--- a/ext/iconv/tests/eucjp2iso2022jp.phpt
+++ b/ext/iconv/tests/eucjp2iso2022jp.phpt
@@ -1,7 +1,7 @@
 --TEST--
 EUC-JP to ISO-2022-JP
---SKIPIF--
-<?php include('skipif.inc'); ?>
+--EXTENSIONS--
+iconv
 --INI--
 error_reporting=2039
 --FILE--
diff --git a/ext/iconv/tests/eucjp2sjis.phpt b/ext/iconv/tests/eucjp2sjis.phpt
index ed851541fb1..f1493d8c198 100644
--- a/ext/iconv/tests/eucjp2sjis.phpt
+++ b/ext/iconv/tests/eucjp2sjis.phpt
@@ -1,7 +1,7 @@
 --TEST--
 EUC-JP to SJIS
---SKIPIF--
-<?php include('skipif.inc'); ?>
+--EXTENSIONS--
+iconv
 --INI--
 error_reporting=2039
 --FILE--
diff --git a/ext/iconv/tests/eucjp2utf8.phpt b/ext/iconv/tests/eucjp2utf8.phpt
index cdd0d5deb8c..a3573cd8647 100644
--- a/ext/iconv/tests/eucjp2utf8.phpt
+++ b/ext/iconv/tests/eucjp2utf8.phpt
@@ -1,7 +1,7 @@
 --TEST--
 EUC-JP to UTF8
---SKIPIF--
-<?php include('skipif.inc'); ?>
+--EXTENSIONS--
+iconv
 --INI--
 error_reporting=2039
 --FILE--
diff --git a/ext/iconv/tests/iconv-charset-length-cve-2007-4840.phpt b/ext/iconv/tests/iconv-charset-length-cve-2007-4840.phpt
index 730870d4f71..1978c3a77c5 100644
--- a/ext/iconv/tests/iconv-charset-length-cve-2007-4840.phpt
+++ b/ext/iconv/tests/iconv-charset-length-cve-2007-4840.phpt
@@ -1,7 +1,7 @@
 --TEST--
 iconv() charset parameter length checks (CVE-2007-4840)
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 $a = str_repeat("/", 9000000);
diff --git a/ext/iconv/tests/iconv001.phpt b/ext/iconv/tests/iconv001.phpt
index dc7bd389642..5c0f2c7a0c3 100644
--- a/ext/iconv/tests/iconv001.phpt
+++ b/ext/iconv/tests/iconv001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 iconv() test 1
---SKIPIF--
-<?php include('skipif.inc'); ?>
+--EXTENSIONS--
+iconv
 --INI--
 error_reporting=2039
 --FILE--
diff --git a/ext/iconv/tests/iconv002.phpt b/ext/iconv/tests/iconv002.phpt
index c43402262ec..af9ce73a1e3 100644
--- a/ext/iconv/tests/iconv002.phpt
+++ b/ext/iconv/tests/iconv002.phpt
@@ -1,8 +1,9 @@
 --TEST--
 iconv() test 2 (UCS4BE to ASCII)
+--EXTENSIONS--
+iconv
 --SKIPIF--
 <?php
-include('skipif.inc');
 if (@iconv("ascii","UCS-4LE", "abcd") == '') {
     die("skip conversion to UCS-4LE not supported");
 }
diff --git a/ext/iconv/tests/iconv003.phpt b/ext/iconv/tests/iconv003.phpt
index 94ed39f3f6a..86e2e207b2a 100644
--- a/ext/iconv/tests/iconv003.phpt
+++ b/ext/iconv/tests/iconv003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 iconv() test 3
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 for ($i = 0; $i < 3; ++$i) {
diff --git a/ext/iconv/tests/iconv004.phpt b/ext/iconv/tests/iconv004.phpt
index cf8c65bd3a4..484ccde245e 100644
--- a/ext/iconv/tests/iconv004.phpt
+++ b/ext/iconv/tests/iconv004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 iconv_mime_encode() sanity cheeck.
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --INI--
 input_encoding = ISO-8859-1
 internal_encoding = ISO-8859-1
diff --git a/ext/iconv/tests/iconv_basic.phpt b/ext/iconv/tests/iconv_basic.phpt
index f73b275d539..eea0faae426 100644
--- a/ext/iconv/tests/iconv_basic.phpt
+++ b/ext/iconv/tests/iconv_basic.phpt
@@ -1,10 +1,7 @@
 --TEST--
 Test iconv() function : basic functionality
---SKIPIF--
-<?php
-extension_loaded('iconv') or die('skip');
-function_exists('iconv') or die("skip iconv() is not available in this build");
-?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 /*
diff --git a/ext/iconv/tests/iconv_basic_001-win32.phpt b/ext/iconv/tests/iconv_basic_001-win32.phpt
index 59a3dbd8630..19e2c3bb273 100644
--- a/ext/iconv/tests/iconv_basic_001-win32.phpt
+++ b/ext/iconv/tests/iconv_basic_001-win32.phpt
@@ -2,8 +2,9 @@
 Test the basics to function iconv.
 --CREDITS--
 Rodrigo Prado de Jesus <royopa [at] gmail [dot] com>
+--EXTENSIONS--
+iconv
 --SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
 <?php if(substr(PHP_OS, 0, 3) != 'WIN' ) {die('skip windows only test');} ?>
 --FILE--
 <?php
diff --git a/ext/iconv/tests/iconv_basic_001.phpt b/ext/iconv/tests/iconv_basic_001.phpt
index 9f33f6b1106..b60f55aa168 100644
--- a/ext/iconv/tests/iconv_basic_001.phpt
+++ b/ext/iconv/tests/iconv_basic_001.phpt
@@ -2,8 +2,9 @@
 Test the basics to function iconv.
 --CREDITS--
 Rodrigo Prado de Jesus <royopa [at] gmail [dot] com>
+--EXTENSIONS--
+iconv
 --SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
 <?php if(substr(PHP_OS, 0, 3) == 'WIN' ) {die('skip not for windows');} ?>
 <?php if(setlocale(LC_ALL, "en_US.utf8") === false) { die('skip en_US.utf8 locales not available'); } ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_default_charset.phpt b/ext/iconv/tests/iconv_default_charset.phpt
index e0874820b25..b2fd26f855e 100644
--- a/ext/iconv/tests/iconv_default_charset.phpt
+++ b/ext/iconv/tests/iconv_default_charset.phpt
@@ -1,10 +1,7 @@
 --TEST--
 Test default_charset handling
---SKIPIF--
-<?php
-extension_loaded('iconv') or die('skip');
-function_exists('iconv_get_encoding') or die("skip iconv_get_encoding() is not available in this build");
-?>
+--EXTENSIONS--
+iconv
 --INI--
 error_reporting=E_ALL & ~E_DEPRECATED
 default_charset=UTF-8
diff --git a/ext/iconv/tests/iconv_encoding_basic.phpt b/ext/iconv/tests/iconv_encoding_basic.phpt
index 4af5b6a9726..5e2b3efe872 100644
--- a/ext/iconv/tests/iconv_encoding_basic.phpt
+++ b/ext/iconv/tests/iconv_encoding_basic.phpt
@@ -1,10 +1,7 @@
 --TEST--
 Test iconv_get_encoding()/iconv_set_encoding() function : basic functionality
---SKIPIF--
-<?php
-extension_loaded('iconv') or die('skip');
-function_exists('iconv_get_encoding') or die("skip iconv_get_encoding() is not available in this build");
-?>
+--EXTENSIONS--
+iconv
 --INI--
 error_reporting=E_ALL & ~E_DEPRECATED
 input_encoding=ISO-8859-1
diff --git a/ext/iconv/tests/iconv_get_encoding_basic.phpt b/ext/iconv/tests/iconv_get_encoding_basic.phpt
index 84ee932e105..398daa477df 100644
--- a/ext/iconv/tests/iconv_get_encoding_basic.phpt
+++ b/ext/iconv/tests/iconv_get_encoding_basic.phpt
@@ -3,8 +3,8 @@ iconv_get_encoding() parameter tests
 --CREDITS--
 Oystein Rose <orose@redpill-linpro.com>
 #PHPTestFest2009 Norway 2009-06-09 \o/
---SKIPIF--
-<?php if (!extension_loaded("iconv")) { echo 'skip extension not available'; } ?>
+--EXTENSIONS--
+iconv
 --INI--
 error_reporting=E_ALL & ~E_DEPRECATED
 --FILE--
diff --git a/ext/iconv/tests/iconv_ini_encoding.phpt b/ext/iconv/tests/iconv_ini_encoding.phpt
index 7fd163c7dba..f034f528ae5 100644
--- a/ext/iconv/tests/iconv_ini_encoding.phpt
+++ b/ext/iconv/tests/iconv_ini_encoding.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Encoding INI test
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip mbstring not available'); ?>
+--EXTENSIONS--
+iconv
 --INI--
 error_reporting=E_ALL & ~E_DEPRECATED
 default_charset=ISO-8859-1
diff --git a/ext/iconv/tests/iconv_mime_decode-charset-length-cve-2007-4840.phpt b/ext/iconv/tests/iconv_mime_decode-charset-length-cve-2007-4840.phpt
index b6af4749e8b..4310151e8ee 100644
--- a/ext/iconv/tests/iconv_mime_decode-charset-length-cve-2007-4840.phpt
+++ b/ext/iconv/tests/iconv_mime_decode-charset-length-cve-2007-4840.phpt
@@ -1,7 +1,7 @@
 --TEST--
 iconv_mime_decode() charset parameter length checks (CVE-2007-4840)
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 $a = str_repeat("/", 9000000);
diff --git a/ext/iconv/tests/iconv_mime_decode.phpt b/ext/iconv/tests/iconv_mime_decode.phpt
index 8bfb8f6a016..00d8b2244bf 100644
--- a/ext/iconv/tests/iconv_mime_decode.phpt
+++ b/ext/iconv/tests/iconv_mime_decode.phpt
@@ -1,7 +1,7 @@
 --TEST--
 iconv_mime_decode()
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --INI--
 iconv.internal_charset=iso-8859-1
 --FILE--
diff --git a/ext/iconv/tests/iconv_mime_decode_headers-charset-length-cve-2007-4840.phpt b/ext/iconv/tests/iconv_mime_decode_headers-charset-length-cve-2007-4840.phpt
index 1ef41213051..ab7dfd39e73 100644
--- a/ext/iconv/tests/iconv_mime_decode_headers-charset-length-cve-2007-4840.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_headers-charset-length-cve-2007-4840.phpt
@@ -1,7 +1,7 @@
 --TEST--
 iconv_mime_decode_headers() charset parameter length checks (CVE-2007-4840)
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 $a = str_repeat("/", 9000000);
diff --git a/ext/iconv/tests/iconv_mime_decode_headers.phpt b/ext/iconv/tests/iconv_mime_decode_headers.phpt
index 0c418e559df..a88a8aee98b 100644
--- a/ext/iconv/tests/iconv_mime_decode_headers.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_headers.phpt
@@ -1,7 +1,7 @@
 --TEST--
 iconv_mime_decode_headers()
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --INI--
 iconv.internal_charset=iso-8859-1
 --FILE--
diff --git a/ext/iconv/tests/iconv_mime_encode.phpt b/ext/iconv/tests/iconv_mime_encode.phpt
index 6f4ba1c7a9b..e055f53b016 100644
--- a/ext/iconv/tests/iconv_mime_encode.phpt
+++ b/ext/iconv/tests/iconv_mime_encode.phpt
@@ -1,7 +1,7 @@
 --TEST--
 iconv_mime_encode()
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --INI--
 iconv.internal_charset=iso-8859-1
 --FILE--
diff --git a/ext/iconv/tests/iconv_set_encoding-charset-length-cve-2007-4840.phpt b/ext/iconv/tests/iconv_set_encoding-charset-length-cve-2007-4840.phpt
index b0ba4016fb9..bb05d6794b8 100644
--- a/ext/iconv/tests/iconv_set_encoding-charset-length-cve-2007-4840.phpt
+++ b/ext/iconv/tests/iconv_set_encoding-charset-length-cve-2007-4840.phpt
@@ -1,7 +1,7 @@
 --TEST--
 iconv_set_encoding() charset parameter length checks (CVE-2007-4840)
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 $a = str_repeat("/", 9000000);
diff --git a/ext/iconv/tests/iconv_stream_filter.phpt b/ext/iconv/tests/iconv_stream_filter.phpt
index 69ec699d71d..1d642a75142 100644
--- a/ext/iconv/tests/iconv_stream_filter.phpt
+++ b/ext/iconv/tests/iconv_stream_filter.phpt
@@ -1,7 +1,7 @@
 --TEST--
 iconv stream filter
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --INI--
 iconv.internal_charset=iso-8859-1
 --FILE--
diff --git a/ext/iconv/tests/iconv_stream_filter_delimiter.phpt b/ext/iconv/tests/iconv_stream_filter_delimiter.phpt
index e08ceeb69f9..edc56d5774c 100644
--- a/ext/iconv/tests/iconv_stream_filter_delimiter.phpt
+++ b/ext/iconv/tests/iconv_stream_filter_delimiter.phpt
@@ -1,7 +1,7 @@
 --TEST--
 iconv stream filter
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --INI--
 iconv.internal_charset=iso-8859-1
 --FILE--
diff --git a/ext/iconv/tests/iconv_strlen-charset-length-cve-2007-4840.phpt b/ext/iconv/tests/iconv_strlen-charset-length-cve-2007-4840.phpt
index f202d53625e..eacd02c008c 100644
--- a/ext/iconv/tests/iconv_strlen-charset-length-cve-2007-4840.phpt
+++ b/ext/iconv/tests/iconv_strlen-charset-length-cve-2007-4840.phpt
@@ -1,7 +1,7 @@
 --TEST--
 iconv_strlen() charset parameter length checks (CVE-2007-4840)
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 $a = str_repeat("/", 9791999);
diff --git a/ext/iconv/tests/iconv_strlen.phpt b/ext/iconv/tests/iconv_strlen.phpt
index 7984798f577..2c88222897a 100644
--- a/ext/iconv/tests/iconv_strlen.phpt
+++ b/ext/iconv/tests/iconv_strlen.phpt
@@ -1,7 +1,7 @@
 --TEST--
 iconv_strlen()
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 function foo($str, $charset) {
diff --git a/ext/iconv/tests/iconv_strlen_basic.phpt b/ext/iconv/tests/iconv_strlen_basic.phpt
index 578fedc6730..b15f209947b 100644
--- a/ext/iconv/tests/iconv_strlen_basic.phpt
+++ b/ext/iconv/tests/iconv_strlen_basic.phpt
@@ -1,10 +1,7 @@
 --TEST--
 Test iconv_strlen() function : basic functionality
---SKIPIF--
-<?php
-extension_loaded('iconv') or die('skip');
-function_exists('iconv_strlen') or die("skip iconv_strlen() is not available in this build");
-?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 /*
diff --git a/ext/iconv/tests/iconv_strlen_error2.phpt b/ext/iconv/tests/iconv_strlen_error2.phpt
index a4517f6e08f..a6b5e5eb062 100644
--- a/ext/iconv/tests/iconv_strlen_error2.phpt
+++ b/ext/iconv/tests/iconv_strlen_error2.phpt
@@ -1,10 +1,7 @@
 --TEST--
 Test iconv_strlen() function : error conditions - pass an unknown encoding
---SKIPIF--
-<?php
-extension_loaded('iconv') or die('skip');
-function_exists('iconv_strlen') or die("skip iconv_strlen() is not available in this build");
-?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 /*
diff --git a/ext/iconv/tests/iconv_strpos-charset-length-cve-2007-4840.phpt b/ext/iconv/tests/iconv_strpos-charset-length-cve-2007-4840.phpt
index 6bfbde0546b..8f8fe8fffa6 100644
--- a/ext/iconv/tests/iconv_strpos-charset-length-cve-2007-4840.phpt
+++ b/ext/iconv/tests/iconv_strpos-charset-length-cve-2007-4840.phpt
@@ -1,7 +1,7 @@
 --TEST--
 iconv_strpos() charset parameter length checks (CVE-2007-4840)
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 $a = str_repeat("/", 9000000);
diff --git a/ext/iconv/tests/iconv_strpos.phpt b/ext/iconv/tests/iconv_strpos.phpt
index df9427d2c62..c32fe921e62 100644
--- a/ext/iconv/tests/iconv_strpos.phpt
+++ b/ext/iconv/tests/iconv_strpos.phpt
@@ -1,7 +1,7 @@
 --TEST--
 iconv_strpos()
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --INI--
 iconv.internal_charset=ISO-8859-1
 --FILE--
diff --git a/ext/iconv/tests/iconv_strpos_basic.phpt b/ext/iconv/tests/iconv_strpos_basic.phpt
index 4f9bd664e1d..c3ae88c208f 100644
--- a/ext/iconv/tests/iconv_strpos_basic.phpt
+++ b/ext/iconv/tests/iconv_strpos_basic.phpt
@@ -1,10 +1,7 @@
 --TEST--
 Test iconv_strpos() function : basic functionality
---SKIPIF--
-<?php
-extension_loaded('iconv') or die('skip');
-function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in this build");
-?>
+--EXTENSIONS--
+iconv
 --INI--
 error_reporting=E_ALL & ~E_DEPRECATED
 --FILE--
diff --git a/ext/iconv/tests/iconv_strpos_error2.phpt b/ext/iconv/tests/iconv_strpos_error2.phpt
index ac22704b2d9..c8ec511d172 100644
--- a/ext/iconv/tests/iconv_strpos_error2.phpt
+++ b/ext/iconv/tests/iconv_strpos_error2.phpt
@@ -1,10 +1,7 @@
 --TEST--
 Test iconv_strpos() function : error conditions - Pass unknown encoding
---SKIPIF--
-<?php
-extension_loaded('iconv') or die('skip');
-function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in this build");
-?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 /*
diff --git a/ext/iconv/tests/iconv_strpos_variation5.phpt b/ext/iconv/tests/iconv_strpos_variation5.phpt
index 625c44efa7e..2cf4b947616 100644
--- a/ext/iconv/tests/iconv_strpos_variation5.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation5.phpt
@@ -1,10 +1,7 @@
 --TEST--
 Test iconv_strpos() function : usage variations - Pass different integers as $offset argument
---SKIPIF--
-<?php
-extension_loaded('iconv') or die('skip');
-function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in this build");
-?>
+--EXTENSIONS--
+iconv
 --INI--
 error_reporting=E_ALL & ~E_DEPRECATED
 --FILE--
diff --git a/ext/iconv/tests/iconv_strrpos-charset-length-cve-2007-4840.phpt b/ext/iconv/tests/iconv_strrpos-charset-length-cve-2007-4840.phpt
index 554920cc26e..14f7846ede1 100644
--- a/ext/iconv/tests/iconv_strrpos-charset-length-cve-2007-4840.phpt
+++ b/ext/iconv/tests/iconv_strrpos-charset-length-cve-2007-4840.phpt
@@ -1,7 +1,7 @@
 --TEST--
 iconv_strrpos() charset parameter length checks (CVE-2007-4840)
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 $a = str_repeat("/", 9000000);
diff --git a/ext/iconv/tests/iconv_strrpos.phpt b/ext/iconv/tests/iconv_strrpos.phpt
index 1e5b5fb960f..66d4e81d1d2 100644
--- a/ext/iconv/tests/iconv_strrpos.phpt
+++ b/ext/iconv/tests/iconv_strrpos.phpt
@@ -1,7 +1,7 @@
 --TEST--
 iconv_strrpos()
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --INI--
 iconv.internal_charset=ISO-8859-1
 --FILE--
diff --git a/ext/iconv/tests/iconv_strrpos_basic.phpt b/ext/iconv/tests/iconv_strrpos_basic.phpt
index d68ff039bab..f85f6ba302a 100644
--- a/ext/iconv/tests/iconv_strrpos_basic.phpt
+++ b/ext/iconv/tests/iconv_strrpos_basic.phpt
@@ -1,10 +1,7 @@
 --TEST--
 Test iconv_strrpos() function : basic functionality
---SKIPIF--
-<?php
-extension_loaded('iconv') or die('skip');
-function_exists('iconv_strrpos') or die("skip iconv_strrpos() is not available in this build");
-?>
+--EXTENSIONS--
+iconv
 --INI--
 error_reporting=E_ALL & ~E_DEPRECATED
 --FILE--
diff --git a/ext/iconv/tests/iconv_strrpos_error2.phpt b/ext/iconv/tests/iconv_strrpos_error2.phpt
index 4e02ac4712f..fd4c80c9422 100644
--- a/ext/iconv/tests/iconv_strrpos_error2.phpt
+++ b/ext/iconv/tests/iconv_strrpos_error2.phpt
@@ -1,10 +1,7 @@
 --TEST--
 Test iconv_strrpos() function : error conditions - pass an unknown encoding
---SKIPIF--
-<?php
-extension_loaded('iconv') or die('skip');
-function_exists('iconv_strrpos') or die("skip iconv_strrpos() is not available in this build");
-?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 /*
diff --git a/ext/iconv/tests/iconv_substr-charset-length-cve-2007-4783.phpt b/ext/iconv/tests/iconv_substr-charset-length-cve-2007-4783.phpt
index 77a29d0f21b..bf38adaff6c 100644
--- a/ext/iconv/tests/iconv_substr-charset-length-cve-2007-4783.phpt
+++ b/ext/iconv/tests/iconv_substr-charset-length-cve-2007-4783.phpt
@@ -1,7 +1,7 @@
 --TEST--
 iconv_substr() charset parameter length checks (CVE-2007-4783)
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 $a = str_repeat('A', 99897);
diff --git a/ext/iconv/tests/iconv_substr.phpt b/ext/iconv/tests/iconv_substr.phpt
index 3064c3a6a8d..4244919de13 100644
--- a/ext/iconv/tests/iconv_substr.phpt
+++ b/ext/iconv/tests/iconv_substr.phpt
@@ -1,7 +1,7 @@
 --TEST--
 iconv_substr()
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --INI--
 iconv.internal_charset=ISO-8859-1
 --FILE--
diff --git a/ext/iconv/tests/iconv_substr_basic.phpt b/ext/iconv/tests/iconv_substr_basic.phpt
index 7d24f44a23c..41cb75d4491 100644
--- a/ext/iconv/tests/iconv_substr_basic.phpt
+++ b/ext/iconv/tests/iconv_substr_basic.phpt
@@ -1,10 +1,7 @@
 --TEST--
 Test iconv_substr() function : basic functionality
---SKIPIF--
-<?php
-extension_loaded('iconv') or die('skip');
-function_exists('iconv_substr') or die("skip iconv_substr() is not available in this build");
-?>
+--EXTENSIONS--
+iconv
 --INI--
 input_encoding=ISO-8859-1
 internal_encoding=ISO-8859-1
diff --git a/ext/iconv/tests/iconv_substr_error2.phpt b/ext/iconv/tests/iconv_substr_error2.phpt
index 858b8951869..c3b01d9aa05 100644
--- a/ext/iconv/tests/iconv_substr_error2.phpt
+++ b/ext/iconv/tests/iconv_substr_error2.phpt
@@ -1,10 +1,7 @@
 --TEST--
 Test iconv_substr() function : error conditions - Pass an unknown encoding
---SKIPIF--
-<?php
-extension_loaded('iconv') or die('skip');
-function_exists('iconv_substr') or die("skip iconv_substr() is not available in this build");
-?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 /*
diff --git a/ext/iconv/tests/iconv_substr_out_of_bounds.phpt b/ext/iconv/tests/iconv_substr_out_of_bounds.phpt
index 4e3e5fae0a9..fa335ccc22e 100644
--- a/ext/iconv/tests/iconv_substr_out_of_bounds.phpt
+++ b/ext/iconv/tests/iconv_substr_out_of_bounds.phpt
@@ -1,7 +1,7 @@
 --TEST--
 iconv_substr() with out of bounds offset
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --FILE--
 <?php
 
diff --git a/ext/iconv/tests/ob_iconv_handler-charset-length-cve-2007-4840.phpt b/ext/iconv/tests/ob_iconv_handler-charset-length-cve-2007-4840.phpt
index fd01d83ca1e..545b48a2f2e 100644
--- a/ext/iconv/tests/ob_iconv_handler-charset-length-cve-2007-4840.phpt
+++ b/ext/iconv/tests/ob_iconv_handler-charset-length-cve-2007-4840.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ob_iconv_handler() charset parameter length checks (CVE-2007-4840)
---SKIPIF--
-<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--EXTENSIONS--
+iconv
 --INI--
 memory_limit=256M
 --FILE--
diff --git a/ext/iconv/tests/ob_iconv_handler.phpt b/ext/iconv/tests/ob_iconv_handler.phpt
index 6caa4106f91..1cf7e1a048d 100644
--- a/ext/iconv/tests/ob_iconv_handler.phpt
+++ b/ext/iconv/tests/ob_iconv_handler.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ob_iconv_handler()
---SKIPIF--
-<?php include('skipif.inc'); ?>
+--EXTENSIONS--
+iconv
 --INI--
 error_reporting=2039
 --FILE--
diff --git a/ext/iconv/tests/skipif.inc b/ext/iconv/tests/skipif.inc
deleted file mode 100644
index 70d00674466..00000000000
--- a/ext/iconv/tests/skipif.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-if (!extension_loaded("iconv")) {
-    die("skip iconv extension not available\n");
-}
-?>
diff --git a/ext/iconv/tests/translit-failure.phpt b/ext/iconv/tests/translit-failure.phpt
index 1571a316c1a..b639c26b4eb 100644
--- a/ext/iconv/tests/translit-failure.phpt
+++ b/ext/iconv/tests/translit-failure.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Translit failure
+--EXTENSIONS--
+iconv
 --SKIPIF--
 <?php
-include('skipif.inc');
 ( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\"");
 ?>
 --INI--
diff --git a/ext/iconv/tests/translit-utf8.phpt b/ext/iconv/tests/translit-utf8.phpt
index d25cd76d714..14b5d7a05e1 100644
--- a/ext/iconv/tests/translit-utf8.phpt
+++ b/ext/iconv/tests/translit-utf8.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Translit UTF-8 quotes
+--EXTENSIONS--
+iconv
 --SKIPIF--
 <?php
-include('skipif.inc');
 ( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\"");
 ?>
 --INI--
diff --git a/ext/opcache/tests/001_cli.phpt b/ext/opcache/tests/001_cli.phpt
index 3be1a52228e..cce8276abd2 100644
--- a/ext/opcache/tests/001_cli.phpt
+++ b/ext/opcache/tests/001_cli.phpt
@@ -4,8 +4,8 @@
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_cache_only=0
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 $config = opcache_get_configuration();
diff --git a/ext/opcache/tests/assign_obj_op_of_fetch_dim.phpt b/ext/opcache/tests/assign_obj_op_of_fetch_dim.phpt
index 5368cfbd182..1f42c3ac2ae 100644
--- a/ext/opcache/tests/assign_obj_op_of_fetch_dim.phpt
+++ b/ext/opcache/tests/assign_obj_op_of_fetch_dim.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Type inference for $ary[$idx]->prop +=
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/blacklist-win32.phpt b/ext/opcache/tests/blacklist-win32.phpt
index 17d75119aea..d1bfc1a7d4d 100644
--- a/ext/opcache/tests/blacklist-win32.phpt
+++ b/ext/opcache/tests/blacklist-win32.phpt
@@ -6,8 +6,9 @@ opcache.enable_cli=1
 opcache.blacklist_filename={PWD}/opcache-*.blacklist
 opcache.file_update_protection=0
 opcache.file_cache_only=0
+--EXTENSIONS--
+opcache
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php if (substr(PHP_OS, 0, 3) != 'WIN') {  die('skip only for Windows'); } ?>
 --FILE--
 <?php
diff --git a/ext/opcache/tests/blacklist.phpt b/ext/opcache/tests/blacklist.phpt
index 21139b751d7..9514f81c13d 100644
--- a/ext/opcache/tests/blacklist.phpt
+++ b/ext/opcache/tests/blacklist.phpt
@@ -7,8 +7,9 @@ opcache.blacklist_filename={PWD}/opcache-*.blacklist
 opcache.file_update_protection=0
 opcache.file_cache_only=0
 opcache.preload=
+--EXTENSIONS--
+opcache
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip not for Windows');
diff --git a/ext/opcache/tests/block_pass_001.phpt b/ext/opcache/tests/block_pass_001.phpt
index 2fe17a857af..e89460cc24a 100644
--- a/ext/opcache/tests/block_pass_001.phpt
+++ b/ext/opcache/tests/block_pass_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Block pass: Bugs in BOOL/QM_ASSIGN elision
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 (bool) (true ? $x : $y);
diff --git a/ext/opcache/tests/block_removal_with_duplicate_successors.phpt b/ext/opcache/tests/block_removal_with_duplicate_successors.phpt
index afe5472d5b5..1751868e8cc 100644
--- a/ext/opcache/tests/block_removal_with_duplicate_successors.phpt
+++ b/ext/opcache/tests/block_removal_with_duplicate_successors.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Removing a block that has duplicate successors
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function test($foo) {
diff --git a/ext/opcache/tests/bool_cp_in_pass1.phpt b/ext/opcache/tests/bool_cp_in_pass1.phpt
index edd08aeef60..9c5f69fe173 100644
--- a/ext/opcache/tests/bool_cp_in_pass1.phpt
+++ b/ext/opcache/tests/bool_cp_in_pass1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Incorrect constant propagation on BOOL in pass 1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function test($foo) {
diff --git a/ext/opcache/tests/bool_not_cv.phpt b/ext/opcache/tests/bool_not_cv.phpt
index 926dc58af9a..d9ee583fbe2 100644
--- a/ext/opcache/tests/bool_not_cv.phpt
+++ b/ext/opcache/tests/bool_not_cv.phpt
@@ -4,8 +4,8 @@ $v = !$v/(bool)$v checks for undefined variables
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_cache_only=0
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function undef_negation() {
diff --git a/ext/opcache/tests/bu69838.phpt b/ext/opcache/tests/bu69838.phpt
index f60cad79bd6..710e9ce3092 100644
--- a/ext/opcache/tests/bu69838.phpt
+++ b/ext/opcache/tests/bu69838.phpt
@@ -4,8 +4,8 @@ Bug #69838 OPCACHE Warning Internal error: wrong size calculation
 opcache.enable=1
 opcache.enable_cli=1
 opcache.log_verbosity_level=2
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug64353.phpt b/ext/opcache/tests/bug64353.phpt
index bfb332e26ed..bef3846d733 100644
--- a/ext/opcache/tests/bug64353.phpt
+++ b/ext/opcache/tests/bug64353.phpt
@@ -4,8 +4,8 @@ Bug #64353 (Built-in classes can be unavailable with dynamic includes and OPcach
 allow_url_include=1
 opcache.enable=1
 opcache.enable_cli=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class BugLoader extends php_user_filter {
diff --git a/ext/opcache/tests/bug64482.phpt b/ext/opcache/tests/bug64482.phpt
index e328c9fc1dd..7a04b2f1fca 100644
--- a/ext/opcache/tests/bug64482.phpt
+++ b/ext/opcache/tests/bug64482.phpt
@@ -3,8 +3,8 @@ Bug #64482 (Opcodes for dynamic includes should not be cached)
 --INI--
 opcache.enable=1
 opcache.enable_cli=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 include 'bug64482.inc';
diff --git a/ext/opcache/tests/bug65510.phpt b/ext/opcache/tests/bug65510.phpt
index 9e0573a10ea..4d629c3c77c 100644
--- a/ext/opcache/tests/bug65510.phpt
+++ b/ext/opcache/tests/bug65510.phpt
@@ -4,8 +4,8 @@ Bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var)
 allow_url_include=1
 opcache.enable=1
 opcache.enable_cli=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function parseQuery() {
diff --git a/ext/opcache/tests/bug65559.phpt b/ext/opcache/tests/bug65559.phpt
index 0d40cf10f88..9c681a43839 100644
--- a/ext/opcache/tests/bug65559.phpt
+++ b/ext/opcache/tests/bug65559.phpt
@@ -4,8 +4,8 @@ Bug #65559 (cache not cleared if changes occur while running)
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=2
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 $file =  __DIR__ . "/bug6559.inc.php";
diff --git a/ext/opcache/tests/bug65665.phpt b/ext/opcache/tests/bug65665.phpt
index fc49bf83fd8..ced05aef006 100644
--- a/ext/opcache/tests/bug65665.phpt
+++ b/ext/opcache/tests/bug65665.phpt
@@ -3,8 +3,8 @@ Bug #65665 (Exception not properly caught when opcache enabled)
 --INI--
 opcache.enable=1
 opcache.enable_cli=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/bug65845.phpt b/ext/opcache/tests/bug65845.phpt
index 2ae5f3974ae..65fda30e15d 100644
--- a/ext/opcache/tests/bug65845.phpt
+++ b/ext/opcache/tests/bug65845.phpt
@@ -3,8 +3,8 @@ Bug #65845 (Error when Zend Opcache Optimizer is fully enabled)
 --INI--
 opcache.enable=1
 opcache.enable_cli=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 $Pile['vars'][(string)'toto'] = 'tutu';
diff --git a/ext/opcache/tests/bug65915.phpt b/ext/opcache/tests/bug65915.phpt
index b62dbd8ea74..da80236d93f 100644
--- a/ext/opcache/tests/bug65915.phpt
+++ b/ext/opcache/tests/bug65915.phpt
@@ -4,9 +4,10 @@ Bug #65915 (Inconsistent results with require return value)
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_cache_only=0
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 // We don't invalidate the file after the second write.
 if (getenv('SKIP_REPEAT')) die("skip Not repeatable");
 ?>
diff --git a/ext/opcache/tests/bug66176.phpt b/ext/opcache/tests/bug66176.phpt
index c6f7a573f10..55a3d9a00f8 100644
--- a/ext/opcache/tests/bug66176.phpt
+++ b/ext/opcache/tests/bug66176.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.file_update_protection=0
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo($v) {
diff --git a/ext/opcache/tests/bug66251.phpt b/ext/opcache/tests/bug66251.phpt
index 20b2a166d7b..13c267d2670 100644
--- a/ext/opcache/tests/bug66251.phpt
+++ b/ext/opcache/tests/bug66251.phpt
@@ -4,8 +4,8 @@ Bug #66251 (Constants get statically bound at compile time when Optimized)
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php if (!extension_loaded('Zend OPcache')) die("skip Zend OPcache extension not loaded"); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 printf ("A=%s\n", getA());
diff --git a/ext/opcache/tests/bug66334.phpt b/ext/opcache/tests/bug66334.phpt
index 3da9a7657dd..3e7c731e751 100644
--- a/ext/opcache/tests/bug66334.phpt
+++ b/ext/opcache/tests/bug66334.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.file_update_protection=0
 enable_dl=0
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 if (extension_loaded("unknown_extension")) {
diff --git a/ext/opcache/tests/bug66338.phpt b/ext/opcache/tests/bug66338.phpt
index 14734815613..61065a8e3fa 100644
--- a/ext/opcache/tests/bug66338.phpt
+++ b/ext/opcache/tests/bug66338.phpt
@@ -2,8 +2,8 @@
 Bug #66338 (Optimization binding of class constants is not safely opcacheable)
 --INI--
 opcache.enable=0
---SKIPIF--
-<?php if (!extension_loaded('Zend OPcache')) die("skip Zend OPcache extension not loaded"); ?>
+--EXTENSIONS--
+opcache
 --CONFLICTS--
 server
 --FILE--
diff --git a/ext/opcache/tests/bug66440.phpt b/ext/opcache/tests/bug66440.phpt
index 4efcb6f221d..85291aadabf 100644
--- a/ext/opcache/tests/bug66440.phpt
+++ b/ext/opcache/tests/bug66440.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.file_update_protection=0
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 if(constant('PHP_BINARY')) {
diff --git a/ext/opcache/tests/bug66461.phpt b/ext/opcache/tests/bug66461.phpt
index 57642b0a161..b6df7e92e06 100644
--- a/ext/opcache/tests/bug66461.phpt
+++ b/ext/opcache/tests/bug66461.phpt
@@ -7,8 +7,8 @@ opcache.optimization_level=-1
 opcache.log_verbosity_level=1
 opcache.file_update_protection=0
 opcache.interned_strings_buffer=0
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 echo "ok\n";
diff --git a/ext/opcache/tests/bug66474.phpt b/ext/opcache/tests/bug66474.phpt
index b1ea509c23c..2cdcd905283 100644
--- a/ext/opcache/tests/bug66474.phpt
+++ b/ext/opcache/tests/bug66474.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.file_update_protection=0
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/bug67215.phpt b/ext/opcache/tests/bug67215.phpt
index 4a9ac7c7112..d9bb18e8abf 100644
--- a/ext/opcache/tests/bug67215.phpt
+++ b/ext/opcache/tests/bug67215.phpt
@@ -4,8 +4,8 @@ Bug #67215 (php-cgi work with opcache, may be segmentation fault happen)
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug68104.phpt b/ext/opcache/tests/bug68104.phpt
index 6d994c79afe..0726d96a1cd 100644
--- a/ext/opcache/tests/bug68104.phpt
+++ b/ext/opcache/tests/bug68104.phpt
@@ -6,8 +6,8 @@ manuel <manuel@mausz.at>
 opcache.enable=1
 opcache.enable_cli=1
 disable_functions=dl
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 var_dump(is_callable("dl"));
diff --git a/ext/opcache/tests/bug69038.phpt b/ext/opcache/tests/bug69038.phpt
index 09b9af4077a..aeeba888ab7 100644
--- a/ext/opcache/tests/bug69038.phpt
+++ b/ext/opcache/tests/bug69038.phpt
@@ -4,8 +4,8 @@ Bug #69038 (switch(SOMECONSTANT) misbehaves)
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function a($a = "bad") {
diff --git a/ext/opcache/tests/bug69125.phpt b/ext/opcache/tests/bug69125.phpt
index 913be01b00f..6c881151ea8 100644
--- a/ext/opcache/tests/bug69125.phpt
+++ b/ext/opcache/tests/bug69125.phpt
@@ -3,8 +3,8 @@ Bug #69125 (Array numeric string as key)
 --INI--
 opcache.enable=1
 opcache.enable_cli=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug69159.phpt b/ext/opcache/tests/bug69159.phpt
index 158f242b3f4..07760d99a6a 100644
--- a/ext/opcache/tests/bug69159.phpt
+++ b/ext/opcache/tests/bug69159.phpt
@@ -3,8 +3,8 @@ Bug #69159 (Opcache causes problem when passing a variable variable to a functio
 --INI--
 opcache.enable=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 $i = 1;
diff --git a/ext/opcache/tests/bug69281.phpt b/ext/opcache/tests/bug69281.phpt
index 506f466ac89..da681698ef0 100644
--- a/ext/opcache/tests/bug69281.phpt
+++ b/ext/opcache/tests/bug69281.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.validate_timestamps=0
 opcache.file_cache_only=0
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 var_dump(opcache_is_script_cached(__FILE__));
diff --git a/ext/opcache/tests/bug69549.phpt b/ext/opcache/tests/bug69549.phpt
index 53a143a2296..b03207603f2 100644
--- a/ext/opcache/tests/bug69549.phpt
+++ b/ext/opcache/tests/bug69549.phpt
@@ -4,8 +4,8 @@ Bug #69549 (Memory leak with opcache.optimization_level=0xFFFFFFFF)
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 $a = array(true);
diff --git a/ext/opcache/tests/bug69688.phpt b/ext/opcache/tests/bug69688.phpt
index cc75960e734..204d8a92526 100644
--- a/ext/opcache/tests/bug69688.phpt
+++ b/ext/opcache/tests/bug69688.phpt
@@ -4,8 +4,8 @@ Bug #69688 (segfault with eval and opcache fast shutdown)
 opcache.enable=1
 opcache.enable_cli=1
 opcache.fast_shutdown=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 eval('function g() {} function g2() {} function g3() {}');
diff --git a/ext/opcache/tests/bug70111.phpt b/ext/opcache/tests/bug70111.phpt
index 465d0ee848b..47d77fbd6ae 100644
--- a/ext/opcache/tests/bug70111.phpt
+++ b/ext/opcache/tests/bug70111.phpt
@@ -3,8 +3,8 @@ Bug #70111 (Segfault when a function uses both an explicit return type and an ex
 --INI--
 opcache.enable=1
 opcache.enable_cli=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug70207.phpt b/ext/opcache/tests/bug70207.phpt
index a73b7a69161..ce0ed4d341e 100644
--- a/ext/opcache/tests/bug70207.phpt
+++ b/ext/opcache/tests/bug70207.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.file_update_protection=0
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function bar() {
diff --git a/ext/opcache/tests/bug70237.phpt b/ext/opcache/tests/bug70237.phpt
index 6bd0318f0b4..545c0a44286 100644
--- a/ext/opcache/tests/bug70237.phpt
+++ b/ext/opcache/tests/bug70237.phpt
@@ -3,8 +3,8 @@ Bug #70237 (Empty while and do-while segmentation fault with opcode on CLI enabl
 --INI--
 opcache.enable=1
 opcache.enable_cli=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug70423.phpt b/ext/opcache/tests/bug70423.phpt
index 015ed11b3f3..2849ddd7a40 100644
--- a/ext/opcache/tests/bug70423.phpt
+++ b/ext/opcache/tests/bug70423.phpt
@@ -5,8 +5,8 @@ open_basedir=.
 opcache.enabled=1
 opcache.enable_cli=1
 opcache.log_verbosity_level=2
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug71127.phpt b/ext/opcache/tests/bug71127.phpt
index cc8886fc27a..a417f0d3120 100644
--- a/ext/opcache/tests/bug71127.phpt
+++ b/ext/opcache/tests/bug71127.phpt
@@ -4,8 +4,8 @@ Bug #71127 (Define in auto_prepend_file is overwrite)
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=0x7FFFBFFF
---SKIPIF--
-<?php if (!extension_loaded('Zend OPcache')) die("skip"); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 $file = __DIR__ . "/bug71127.inc";
diff --git a/ext/opcache/tests/bug71443.phpt b/ext/opcache/tests/bug71443.phpt
index 5887a2c018e..dca98bc0ad5 100644
--- a/ext/opcache/tests/bug71443.phpt
+++ b/ext/opcache/tests/bug71443.phpt
@@ -5,8 +5,9 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.file_cache="{TMP}"
 opcache.file_cache_only=1
+--EXTENSIONS--
+opcache
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php if (substr(PHP_OS, 0, 3) == 'WIN') die('skip..  not for Windows'); ?>
 --FILE--
 <?php
diff --git a/ext/opcache/tests/bug71843.phpt b/ext/opcache/tests/bug71843.phpt
index 28b36f7371d..66ccd823627 100644
--- a/ext/opcache/tests/bug71843.phpt
+++ b/ext/opcache/tests/bug71843.phpt
@@ -4,8 +4,8 @@ Bug #71843 (null ptr deref ZEND_RETURN_SPEC_CONST_HANDLER (zend_vm_execute.h:347
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=0xFFFFBFFF
---SKIPIF--
-<?php if (!extension_loaded('Zend OPcache')) die("skip"); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 define('E', 'E');
diff --git a/ext/opcache/tests/bug72014.phpt b/ext/opcache/tests/bug72014.phpt
index d2ad96c0f1a..16513d015b0 100644
--- a/ext/opcache/tests/bug72014.phpt
+++ b/ext/opcache/tests/bug72014.phpt
@@ -4,8 +4,8 @@ Bug #72014 (Including a file with anonymous classes multiple times leads to fata
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 file_put_contents(__DIR__ . "/bug72014.annon.php", <<<PHP
diff --git a/ext/opcache/tests/bug72762.phpt b/ext/opcache/tests/bug72762.phpt
index e42cdf18506..2a315f4b740 100644
--- a/ext/opcache/tests/bug72762.phpt
+++ b/ext/opcache/tests/bug72762.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #72762: Infinite loop while parsing a file with opcache enabled
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug73402.phpt b/ext/opcache/tests/bug73402.phpt
index a0354c3c622..e60537efa44 100644
--- a/ext/opcache/tests/bug73402.phpt
+++ b/ext/opcache/tests/bug73402.phpt
@@ -3,8 +3,8 @@ Bug #73402 (Opcache segfault when using class constant to call a method)
 --INI--
 opcache.enable=1
 opcache.enable_cli=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class Logger {
diff --git a/ext/opcache/tests/bug73583.phpt b/ext/opcache/tests/bug73583.phpt
index f533e9caf56..9fb98faf80b 100644
--- a/ext/opcache/tests/bug73583.phpt
+++ b/ext/opcache/tests/bug73583.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=0x4ff
 opcache.file_update_protection=0
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 if (true) {
diff --git a/ext/opcache/tests/bug73654.phpt b/ext/opcache/tests/bug73654.phpt
index f2db9ace96c..c7061d571d1 100644
--- a/ext/opcache/tests/bug73654.phpt
+++ b/ext/opcache/tests/bug73654.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #73654: Segmentation fault in zend_call_function
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 echo xyz();
diff --git a/ext/opcache/tests/bug73668.phpt b/ext/opcache/tests/bug73668.phpt
index a94204d7b5f..6c2c61be44b 100644
--- a/ext/opcache/tests/bug73668.phpt
+++ b/ext/opcache/tests/bug73668.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #73668: "SIGFPE Arithmetic exception" in opcache when divide by minus 1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 $a/-1;
diff --git a/ext/opcache/tests/bug73746.phpt b/ext/opcache/tests/bug73746.phpt
index c95aed8076d..c43353e52c4 100644
--- a/ext/opcache/tests/bug73746.phpt
+++ b/ext/opcache/tests/bug73746.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #73746 (Method that returns string returns UNKNOWN:0 instead)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 namespace Core\Bundle\Service\Property\Room\Rooms;
diff --git a/ext/opcache/tests/bug73789.phpt b/ext/opcache/tests/bug73789.phpt
index 5d5cb92f203..36e9e786eeb 100644
--- a/ext/opcache/tests/bug73789.phpt
+++ b/ext/opcache/tests/bug73789.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Bug #73789 (Strange behavior of class constants in switch/case block)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php if (!extension_loaded('ctype')) die('skip extension ctype not loaded'); ?>
+--EXTENSIONS--
+opcache
+ctype
 --FILE--
 <?php
 class Lexer
diff --git a/ext/opcache/tests/bug73847.phpt b/ext/opcache/tests/bug73847.phpt
index 13d411e9e1e..e3198130c2a 100644
--- a/ext/opcache/tests/bug73847.phpt
+++ b/ext/opcache/tests/bug73847.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #73847: Recursion when a variable is redefined as array
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function test() {
diff --git a/ext/opcache/tests/bug74019.phpt b/ext/opcache/tests/bug74019.phpt
index 0392963a8b9..58bec6e268f 100644
--- a/ext/opcache/tests/bug74019.phpt
+++ b/ext/opcache/tests/bug74019.phpt
@@ -3,8 +3,8 @@ Bug #74019	(Segfault with list)
 --INI--
 opcache.enable=1
 opcache.enable_cli=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug74152.phpt b/ext/opcache/tests/bug74152.phpt
index b991365927d..7300a1bd128 100644
--- a/ext/opcache/tests/bug74152.phpt
+++ b/ext/opcache/tests/bug74152.phpt
@@ -4,8 +4,8 @@ Bug #74152 (if statement says true to a null variable)
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug74431.phpt b/ext/opcache/tests/bug74431.phpt
index 48609dc57b1..bbfe0b9d6a5 100644
--- a/ext/opcache/tests/bug74431.phpt
+++ b/ext/opcache/tests/bug74431.phpt
@@ -4,8 +4,8 @@ Bug #74431 - foreach infinite loop
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=0xffffffff
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function test(){
diff --git a/ext/opcache/tests/bug74442.phpt b/ext/opcache/tests/bug74442.phpt
index 55437c1826c..ac3c39a0e0a 100644
--- a/ext/opcache/tests/bug74442.phpt
+++ b/ext/opcache/tests/bug74442.phpt
@@ -2,8 +2,8 @@
 Bug #74442: Opcached version produces a nested array
 --CREDITS--
 Eric Norris <erictnorris@gmail.com>
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class Schema_Base {
diff --git a/ext/opcache/tests/bug74456.phpt b/ext/opcache/tests/bug74456.phpt
index 10f9b04058d..d07116eca96 100644
--- a/ext/opcache/tests/bug74456.phpt
+++ b/ext/opcache/tests/bug74456.phpt
@@ -4,8 +4,8 @@ Bug #74456 (Segmentation error while running a script in CLI mode)
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug74596.phpt b/ext/opcache/tests/bug74596.phpt
index 8a1dc171893..aa93ff2010d 100644
--- a/ext/opcache/tests/bug74596.phpt
+++ b/ext/opcache/tests/bug74596.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.validate_timestamps=0
 opcache.file_cache_only=0
 opcache.revalidate_path=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug74623.phpt b/ext/opcache/tests/bug74623.phpt
index e649e07b4c5..d2d023e5774 100644
--- a/ext/opcache/tests/bug74623.phpt
+++ b/ext/opcache/tests/bug74623.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #74623: Infinite loop in type inference when using HTMLPurifier
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug74663.phpt b/ext/opcache/tests/bug74663.phpt
index ed67c5410fa..2f2db03c815 100644
--- a/ext/opcache/tests/bug74663.phpt
+++ b/ext/opcache/tests/bug74663.phpt
@@ -8,8 +8,8 @@ opcache.enable_file_override=1
 opcache.validate_timestamps=1
 opcache.revalidate_freq=0
 opcache.protect_memory=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 $file = __DIR__ . "/bug74663.inc";
diff --git a/ext/opcache/tests/bug74980.phpt b/ext/opcache/tests/bug74980.phpt
index df77206d7b2..48461dc28b7 100644
--- a/ext/opcache/tests/bug74980.phpt
+++ b/ext/opcache/tests/bug74980.phpt
@@ -3,8 +3,8 @@ Bug #74980 (Narrowing occurred during type inference)
 --INI--
 opcache.enable=1
 opcache.enable_cli=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug75230.phpt b/ext/opcache/tests/bug75230.phpt
index ce67bb06b93..ae6862c8208 100644
--- a/ext/opcache/tests/bug75230.phpt
+++ b/ext/opcache/tests/bug75230.phpt
@@ -4,8 +4,8 @@ Bug #75230 (Invalid opcode 49/1/8 using opcache)
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function f() {
diff --git a/ext/opcache/tests/bug75255.phpt b/ext/opcache/tests/bug75255.phpt
index 2ff3ae00168..0651a1463fb 100644
--- a/ext/opcache/tests/bug75255.phpt
+++ b/ext/opcache/tests/bug75255.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #75255 (Request hangs and not finish)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function generatePlanImage() {
diff --git a/ext/opcache/tests/bug75357.phpt b/ext/opcache/tests/bug75357.phpt
index 99537ed0978..c3e6d02bcc5 100644
--- a/ext/opcache/tests/bug75357.phpt
+++ b/ext/opcache/tests/bug75357.phpt
@@ -4,8 +4,8 @@ Bug #75357 (segfault loading WordPress wp-admin)
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug75370.phpt b/ext/opcache/tests/bug75370.phpt
index 5cc344e3f62..a0c56bbe0c7 100644
--- a/ext/opcache/tests/bug75370.phpt
+++ b/ext/opcache/tests/bug75370.phpt
@@ -4,8 +4,8 @@ Bug #75370 (Webserver hangs on valid PHP text)
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function test()
diff --git a/ext/opcache/tests/bug75556.phpt b/ext/opcache/tests/bug75556.phpt
index c1faa5e15a5..1a7b12fb3e2 100644
--- a/ext/opcache/tests/bug75556.phpt
+++ b/ext/opcache/tests/bug75556.phpt
@@ -4,8 +4,8 @@ Bug #75556 (Invalid opcode 138/1/1)
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
  function createFromFormat($format, $date, ?\DateTimeZone $tz = null): ?\DateTimeInterface
diff --git a/ext/opcache/tests/bug75570.phpt b/ext/opcache/tests/bug75570.phpt
index 90d0869d915..874e6a29a2a 100644
--- a/ext/opcache/tests/bug75570.phpt
+++ b/ext/opcache/tests/bug75570.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #75570 ("Narrowing occurred during type inference" error)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function renderRawGraph(array $parents) {
diff --git a/ext/opcache/tests/bug75608.phpt b/ext/opcache/tests/bug75608.phpt
index aaee526d868..b787679e1a6 100644
--- a/ext/opcache/tests/bug75608.phpt
+++ b/ext/opcache/tests/bug75608.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #75608 ("Narrowing occurred during type inference" error)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class ReactionRatingService
diff --git a/ext/opcache/tests/bug75681.phpt b/ext/opcache/tests/bug75681.phpt
index 72e9d4ace7d..947ffcd8f92 100644
--- a/ext/opcache/tests/bug75681.phpt
+++ b/ext/opcache/tests/bug75681.phpt
@@ -4,8 +4,8 @@ Bug #75681: Warning: Narrowing occurred during type inference (specific case)
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug75687.phpt b/ext/opcache/tests/bug75687.phpt
index 1d9c55f96c7..a27ee0dc6c2 100644
--- a/ext/opcache/tests/bug75687.phpt
+++ b/ext/opcache/tests/bug75687.phpt
@@ -4,8 +4,8 @@ Bug #75687 (var 8 (TMP) has array key type but not value type)
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug75698.phpt b/ext/opcache/tests/bug75698.phpt
index 6fd251bc0a8..5d6ab1664f9 100644
--- a/ext/opcache/tests/bug75698.phpt
+++ b/ext/opcache/tests/bug75698.phpt
@@ -4,8 +4,8 @@ Bug #75698: Using @ crashes php7.2-fpm
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug75938.phpt b/ext/opcache/tests/bug75938.phpt
index 7fba940e97b..24ddb5efad4 100644
--- a/ext/opcache/tests/bug75938.phpt
+++ b/ext/opcache/tests/bug75938.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #75938: Modulus value not stored in variable
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function borken($columns) {
diff --git a/ext/opcache/tests/bug75969.phpt b/ext/opcache/tests/bug75969.phpt
index d7651faca3b..0f539de300b 100644
--- a/ext/opcache/tests/bug75969.phpt
+++ b/ext/opcache/tests/bug75969.phpt
@@ -3,8 +3,8 @@ Bug #75969: Assertion failure in live range DCE due to block pass misoptimizatio
 --INI--
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug76074.phpt b/ext/opcache/tests/bug76074.phpt
index 94c79beff6e..c0581bf32e5 100644
--- a/ext/opcache/tests/bug76074.phpt
+++ b/ext/opcache/tests/bug76074.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #76074 (opcache corrupts variable in for-loop)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug76094.phpt b/ext/opcache/tests/bug76094.phpt
index 35f8d321de8..9cfdc00f5af 100644
--- a/ext/opcache/tests/bug76094.phpt
+++ b/ext/opcache/tests/bug76094.phpt
@@ -4,8 +4,8 @@ Bug #76094 (Access violation when using opcache)
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function MetaType($t)
diff --git a/ext/opcache/tests/bug76275.phpt b/ext/opcache/tests/bug76275.phpt
index 228aa06b4e4..9fbd217c706 100644
--- a/ext/opcache/tests/bug76275.phpt
+++ b/ext/opcache/tests/bug76275.phpt
@@ -4,8 +4,8 @@ Bug #76275: Assertion failure in file cache when unserializing empty try_catch_a
 opcache.enabled=1
 opcache.enable_cli=1
 opcache.file_cache="{TMP}"
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 if (PHP_VERSION_ID >= 70000) {
diff --git a/ext/opcache/tests/bug76281.phpt b/ext/opcache/tests/bug76281.phpt
index 103d299a9eb..a3dfbc3e63d 100644
--- a/ext/opcache/tests/bug76281.phpt
+++ b/ext/opcache/tests/bug76281.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #76281: Opcache causes incorrect "undefined variable" errors
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug76337.phpt b/ext/opcache/tests/bug76337.phpt
index a49f2788b71..d9041bf80dc 100644
--- a/ext/opcache/tests/bug76337.phpt
+++ b/ext/opcache/tests/bug76337.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Bug 76337: segmentation fault when an extension use zend_register_class_alias() and opcache enabled
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php if (!extension_loaded('zend_test')) die('skip zend_test extension not loaded');
+--EXTENSIONS--
+opcache
+zend_test
 --INI--
 opcache.enable=1
 opcache.enable_cli=1
diff --git a/ext/opcache/tests/bug76446.phpt b/ext/opcache/tests/bug76446.phpt
index 41802747cd6..cb16347843a 100644
--- a/ext/opcache/tests/bug76446.phpt
+++ b/ext/opcache/tests/bug76446.phpt
@@ -4,8 +4,8 @@ Bug #76446 (zend_variables.c:73: zend_string_destroy: Assertion `!(zval_gc_flags
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function test()
diff --git a/ext/opcache/tests/bug76463.phpt b/ext/opcache/tests/bug76463.phpt
index e3dacb691c1..8ae99f4c137 100644
--- a/ext/opcache/tests/bug76463.phpt
+++ b/ext/opcache/tests/bug76463.phpt
@@ -4,8 +4,8 @@ Bug #76463 (var has array key type but not value type)
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug76466.phpt b/ext/opcache/tests/bug76466.phpt
index 0f492fb2a3c..4e4b187a00a 100644
--- a/ext/opcache/tests/bug76466.phpt
+++ b/ext/opcache/tests/bug76466.phpt
@@ -4,8 +4,8 @@ Bug #76466 Loop variable confusion
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/bug76477.phpt b/ext/opcache/tests/bug76477.phpt
index 7978ce4d7b1..5d091c81351 100644
--- a/ext/opcache/tests/bug76477.phpt
+++ b/ext/opcache/tests/bug76477.phpt
@@ -4,8 +4,8 @@ Bug #76477 (Opcache causes empty return value)
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 testString();
diff --git a/ext/opcache/tests/bug76711.phpt b/ext/opcache/tests/bug76711.phpt
index 781312503b5..44f579b0548 100644
--- a/ext/opcache/tests/bug76711.phpt
+++ b/ext/opcache/tests/bug76711.phpt
@@ -4,8 +4,8 @@ Bug #76711 OPcache enabled triggers false-positive "Illegal string offset"
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function test($foo) {
diff --git a/ext/opcache/tests/bug76796.phpt b/ext/opcache/tests/bug76796.phpt
index 18f25d25589..b9efbc3ce70 100644
--- a/ext/opcache/tests/bug76796.phpt
+++ b/ext/opcache/tests/bug76796.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 disable_functions=strpos
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug77058.phpt b/ext/opcache/tests/bug77058.phpt
index 0583b3b170a..e241281bd2d 100644
--- a/ext/opcache/tests/bug77058.phpt
+++ b/ext/opcache/tests/bug77058.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #77058: Type inference in opcache causes side effects
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug77092.phpt b/ext/opcache/tests/bug77092.phpt
index 6e61738d648..4798f74b3b3 100644
--- a/ext/opcache/tests/bug77092.phpt
+++ b/ext/opcache/tests/bug77092.phpt
@@ -3,8 +3,8 @@ Bug #77092: array_diff_key() - segmentation fault
 --INI--
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function test() {
diff --git a/ext/opcache/tests/bug77191.phpt b/ext/opcache/tests/bug77191.phpt
index ffbc90700cd..8c305c129d0 100644
--- a/ext/opcache/tests/bug77191.phpt
+++ b/ext/opcache/tests/bug77191.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #77191: Assertion failure in dce_live_ranges() when silencing is used
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function test($x) {
diff --git a/ext/opcache/tests/bug77215.phpt b/ext/opcache/tests/bug77215.phpt
index 26af4432da9..afce26fcc11 100644
--- a/ext/opcache/tests/bug77215.phpt
+++ b/ext/opcache/tests/bug77215.phpt
@@ -3,8 +3,8 @@ Bug #77215: CFG assertion failure on multiple finalizing switch frees in one blo
 --INI--
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug77257.phpt b/ext/opcache/tests/bug77257.phpt
index ef2e17feb49..3fea069dbda 100644
--- a/ext/opcache/tests/bug77257.phpt
+++ b/ext/opcache/tests/bug77257.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #77257: value of variable assigned in a switch() construct gets lost
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function test($x) {
diff --git a/ext/opcache/tests/bug77266.phpt b/ext/opcache/tests/bug77266.phpt
index 08fc74f96dc..4014b9cba4f 100644
--- a/ext/opcache/tests/bug77266.phpt
+++ b/ext/opcache/tests/bug77266.phpt
@@ -4,8 +4,8 @@ Bug #77266 (Assertion failed in dce_live_ranges)
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 final class Lock
diff --git a/ext/opcache/tests/bug77275.phpt b/ext/opcache/tests/bug77275.phpt
index d482f9e7205..41c3a549b2f 100644
--- a/ext/opcache/tests/bug77275.phpt
+++ b/ext/opcache/tests/bug77275.phpt
@@ -3,8 +3,8 @@ Bug #77275: OPcache optimization problem for ArrayAccess->offsetGet(string)
 --INI--
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 namespace Foo;
diff --git a/ext/opcache/tests/bug77310_1.phpt b/ext/opcache/tests/bug77310_1.phpt
index a9af4bffba8..2bd5a3194a0 100644
--- a/ext/opcache/tests/bug77310_1.phpt
+++ b/ext/opcache/tests/bug77310_1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #77310 (1): Incorrect SCCP for compound assign to arrays
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug77434.phpt b/ext/opcache/tests/bug77434.phpt
index 5b8be3e1742..a752f479915 100644
--- a/ext/opcache/tests/bug77434.phpt
+++ b/ext/opcache/tests/bug77434.phpt
@@ -4,8 +4,8 @@ Bug #77434: php-fpm workers are segfaulting in zend_gc_addref
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug77691.phpt b/ext/opcache/tests/bug77691.phpt
index 22726a36a0d..a4f89122c70 100644
--- a/ext/opcache/tests/bug77691.phpt
+++ b/ext/opcache/tests/bug77691.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #77691: Opcache passes wrong value for inline array push assignments
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug77743.phpt b/ext/opcache/tests/bug77743.phpt
index 7a8967b24e5..f6b22cbd5ef 100644
--- a/ext/opcache/tests/bug77743.phpt
+++ b/ext/opcache/tests/bug77743.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #77743: Incorrect pi node insertion for jmpznz with identical successors
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug78014.phpt b/ext/opcache/tests/bug78014.phpt
index 63fc1b6db1b..df497e68949 100644
--- a/ext/opcache/tests/bug78014.phpt
+++ b/ext/opcache/tests/bug78014.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_bug78014.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/bug78015.phpt b/ext/opcache/tests/bug78015.phpt
index aa4ba4db4b0..5b204eb11a3 100644
--- a/ext/opcache/tests/bug78015.phpt
+++ b/ext/opcache/tests/bug78015.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #78015: Incorrect evaluation of expressions involving partials array in SCCP
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug78034.phpt b/ext/opcache/tests/bug78034.phpt
index b4ef93dff6e..688e0d0c918 100644
--- a/ext/opcache/tests/bug78034.phpt
+++ b/ext/opcache/tests/bug78034.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #78034: "pecl" tool fails with abort assertion in zend_ssa.c
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug78106.phpt b/ext/opcache/tests/bug78106.phpt
index a46312baa0d..3162af1269f 100644
--- a/ext/opcache/tests/bug78106.phpt
+++ b/ext/opcache/tests/bug78106.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #78106: Path resolution fails if opcache disabled during request
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --CONFLICTS--
 server
 --FILE--
diff --git a/ext/opcache/tests/bug78175.phpt b/ext/opcache/tests/bug78175.phpt
index b477e04fe65..3e87314607d 100644
--- a/ext/opcache/tests/bug78175.phpt
+++ b/ext/opcache/tests/bug78175.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_bug78175.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/bug78175_2.phpt b/ext/opcache/tests/bug78175_2.phpt
index 7b5ad850ae2..a994c356861 100644
--- a/ext/opcache/tests/bug78175_2.phpt
+++ b/ext/opcache/tests/bug78175_2.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_bug78175_2.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/bug78185.phpt b/ext/opcache/tests/bug78185.phpt
index 56c0ae5586f..224c55675c8 100644
--- a/ext/opcache/tests/bug78185.phpt
+++ b/ext/opcache/tests/bug78185.phpt
@@ -6,8 +6,8 @@ opcache.optimization_level=-1
 opcache.file_cache={PWD}
 opcache.file_cache_only=1
 opcache.jit=0
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 if (substr(PHP_OS, 0, 3) !== 'WIN') {
diff --git a/ext/opcache/tests/bug78189.phpt b/ext/opcache/tests/bug78189.phpt
index c1ef010c83b..9d5d9858ae0 100644
--- a/ext/opcache/tests/bug78189.phpt
+++ b/ext/opcache/tests/bug78189.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #78189 (file cache strips last character of uname hash)
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-if (!extension_loaded('Zend OPcache')) die('skip opcache extension not available');
 if (substr(PHP_OS, 0, 3) !== 'WIN') die('skip this test is for Windows platforms only');
 ?>
 --INI--
diff --git a/ext/opcache/tests/bug78230.phpt b/ext/opcache/tests/bug78230.phpt
index 38cc6849951..d0060ac0d9e 100644
--- a/ext/opcache/tests/bug78230.phpt
+++ b/ext/opcache/tests/bug78230.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #78230: Incorrect type check optimization
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug78341.phpt b/ext/opcache/tests/bug78341.phpt
index 8b10125068b..b5bc8bb4a74 100644
--- a/ext/opcache/tests/bug78341.phpt
+++ b/ext/opcache/tests/bug78341.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #78341: Failure to detect smart branch in DFA pass
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug78376.phpt b/ext/opcache/tests/bug78376.phpt
index 5a8ed8b15a1..ed68247b1fb 100644
--- a/ext/opcache/tests/bug78376.phpt
+++ b/ext/opcache/tests/bug78376.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_bug78376.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/bug78429.phpt b/ext/opcache/tests/bug78429.phpt
index d2d1e43cdc0..77dae7e6eef 100644
--- a/ext/opcache/tests/bug78429.phpt
+++ b/ext/opcache/tests/bug78429.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #78429 (opcache_compile_file(__FILE__); segfaults)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --INI--
 opcache.enable_cli=0
 --FILE--
diff --git a/ext/opcache/tests/bug78937_1.phpt b/ext/opcache/tests/bug78937_1.phpt
index 49411d38844..728efba88ca 100644
--- a/ext/opcache/tests/bug78937_1.phpt
+++ b/ext/opcache/tests/bug78937_1.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_bug78937.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/bug78937_2.phpt b/ext/opcache/tests/bug78937_2.phpt
index 90aaa438834..93b9908cce2 100644
--- a/ext/opcache/tests/bug78937_2.phpt
+++ b/ext/opcache/tests/bug78937_2.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_bug78937.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/bug78937_3.phpt b/ext/opcache/tests/bug78937_3.phpt
index fe9696816cc..ec83b347ebb 100644
--- a/ext/opcache/tests/bug78937_3.phpt
+++ b/ext/opcache/tests/bug78937_3.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_bug78937.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/bug78937_4.phpt b/ext/opcache/tests/bug78937_4.phpt
index dc79a6bd153..be68271b9a3 100644
--- a/ext/opcache/tests/bug78937_4.phpt
+++ b/ext/opcache/tests/bug78937_4.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_bug78937.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/bug78937_5.phpt b/ext/opcache/tests/bug78937_5.phpt
index bb83408d90e..865f1089ea6 100644
--- a/ext/opcache/tests/bug78937_5.phpt
+++ b/ext/opcache/tests/bug78937_5.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_bug78937.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/bug78937_6.phpt b/ext/opcache/tests/bug78937_6.phpt
index 019ddd7ae3e..48ed1f12503 100644
--- a/ext/opcache/tests/bug78937_6.phpt
+++ b/ext/opcache/tests/bug78937_6.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_bug78937.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/bug78986.phpt b/ext/opcache/tests/bug78986.phpt
index 420c828aa4d..8fce234f31a 100644
--- a/ext/opcache/tests/bug78986.phpt
+++ b/ext/opcache/tests/bug78986.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #78986: Opcache segfaults when inheriting ctor from immutable into mutable class
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug79193.phpt b/ext/opcache/tests/bug79193.phpt
index c500400363a..45621139d13 100644
--- a/ext/opcache/tests/bug79193.phpt
+++ b/ext/opcache/tests/bug79193.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #79193: Incorrect type inference for self::$field =& $field
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/bug79412.phpt b/ext/opcache/tests/bug79412.phpt
index 327da1fea27..8830ba6621f 100644
--- a/ext/opcache/tests/bug79412.phpt
+++ b/ext/opcache/tests/bug79412.phpt
@@ -3,8 +3,8 @@ Bug #79412 (Opcache chokes and uses 100% CPU on specific script)
 --INI--
 opcache.enable=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 $limitPerRun = 10;
diff --git a/ext/opcache/tests/bug79475.phpt b/ext/opcache/tests/bug79475.phpt
index 6f536c25f0d..0a1bbb521b6 100644
--- a/ext/opcache/tests/bug79475.phpt
+++ b/ext/opcache/tests/bug79475.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #79475 ([JIT] func_get_args() assertion violation)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/bug79535.phpt b/ext/opcache/tests/bug79535.phpt
index 0a0b53fb113..4e03d53919f 100644
--- a/ext/opcache/tests/bug79535.phpt
+++ b/ext/opcache/tests/bug79535.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #79535: PHP crashes with specific opcache.optimization_level
+--EXTENSIONS--
+opcache
 --INI--
 opcache.optimization_level=0x000000a0
 --FILE--
diff --git a/ext/opcache/tests/bug79665.phpt b/ext/opcache/tests/bug79665.phpt
index 153f63740c9..41dcb411274 100644
--- a/ext/opcache/tests/bug79665.phpt
+++ b/ext/opcache/tests/bug79665.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #79665 (ini_get() and opcache_get_configuration() may be inconsistent)
---SKIPIF--
-<?php
-require __DIR__ . '/skipif.inc';
-?>
+--EXTENSIONS--
+opcache
 --INI--
 opcache.max_wasted_percentage=60
 opcache.memory_consumption=7
diff --git a/ext/opcache/tests/compact_literals.phpt b/ext/opcache/tests/compact_literals.phpt
index 0963c277058..ceb116f82a5 100644
--- a/ext/opcache/tests/compact_literals.phpt
+++ b/ext/opcache/tests/compact_literals.phpt
@@ -4,8 +4,8 @@ Test with compact literals
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/compact_literals_collision.phpt b/ext/opcache/tests/compact_literals_collision.phpt
index b7226b40f526af3640b0e7151cb677ef041d19f9..bf553793ce2090e1ff0b7ed3d09c238887cd26cd 100644
GIT binary patch
delta 30
lcmeyvIGJgJr-*Arh^t?)r@vpYt}a)8L2_bpM(RYjZ2+113RD09

delta 9
QcmbQt^oMbR=fs4~024?A5C8xG

diff --git a/ext/opcache/tests/exit_in_call_arg.phpt b/ext/opcache/tests/exit_in_call_arg.phpt
index 49697808065..1df711ce34d 100644
--- a/ext/opcache/tests/exit_in_call_arg.phpt
+++ b/ext/opcache/tests/exit_in_call_arg.phpt
@@ -1,5 +1,7 @@
 --TEST--
 exit() may occur in a call argument
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/fe_fetch_dce.phpt b/ext/opcache/tests/fe_fetch_dce.phpt
index f7ff0203d78..3f72fabde2a 100644
--- a/ext/opcache/tests/fe_fetch_dce.phpt
+++ b/ext/opcache/tests/fe_fetch_dce.phpt
@@ -4,6 +4,8 @@ Incorrect DCE with FE_FETCH
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/func_info.phpt b/ext/opcache/tests/func_info.phpt
index f5e4b5b1827..8b1f9ef436c 100644
--- a/ext/opcache/tests/func_info.phpt
+++ b/ext/opcache/tests/func_info.phpt
@@ -4,8 +4,8 @@ Test that return types in zend_func_info.c match return types in stubs
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/get_configuration_matches_ini.phpt b/ext/opcache/tests/get_configuration_matches_ini.phpt
index 7ddcb73136c..8e29614acad 100644
--- a/ext/opcache/tests/get_configuration_matches_ini.phpt
+++ b/ext/opcache/tests/get_configuration_matches_ini.phpt
@@ -4,8 +4,8 @@ Test that the directives listed with `opcache_get_configuration` include all tho
 opcache.enable=1
 opcache.enable_cli=1
 opcache.opt_debug_level=0
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 $opts = opcache_get_configuration()['directives'];
diff --git a/ext/opcache/tests/internal_func_info_static_method.phpt b/ext/opcache/tests/internal_func_info_static_method.phpt
index 1a189b00a81..b49a25d0e37 100644
--- a/ext/opcache/tests/internal_func_info_static_method.phpt
+++ b/ext/opcache/tests/internal_func_info_static_method.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Internal static methods should not be confused with global functions
---SKIPIF--
-<?php
-if (!extension_loaded('zend_test')) die('skip requires zend_test');
-?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/invalid_array_key_type.phpt b/ext/opcache/tests/invalid_array_key_type.phpt
index bac62f265a4..071865b0131 100644
--- a/ext/opcache/tests/invalid_array_key_type.phpt
+++ b/ext/opcache/tests/invalid_array_key_type.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Don't add array value type is key type is illegal
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/invalid_new_dce.phpt b/ext/opcache/tests/invalid_new_dce.phpt
index 79dcf6b8128..4f31c8049c9 100644
--- a/ext/opcache/tests/invalid_new_dce.phpt
+++ b/ext/opcache/tests/invalid_new_dce.phpt
@@ -3,8 +3,8 @@ Throwings NEWs should not be DCEd
 --INI--
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/is_script_cached.phpt b/ext/opcache/tests/is_script_cached.phpt
index c3ab054251a..d15d49a6d82 100644
--- a/ext/opcache/tests/is_script_cached.phpt
+++ b/ext/opcache/tests/is_script_cached.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.validate_timestamps=1
 opcache.file_cache_only=0
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 var_dump(opcache_is_script_cached(__FILE__));
diff --git a/ext/opcache/tests/issue0057.phpt b/ext/opcache/tests/issue0057.phpt
index 49e9156f155..20c2f2a1055 100644
--- a/ext/opcache/tests/issue0057.phpt
+++ b/ext/opcache/tests/issue0057.phpt
@@ -4,8 +4,8 @@ ISSUE #57 (segfaults in drupal7)
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/issue0079.phpt b/ext/opcache/tests/issue0079.phpt
index 6d8e60ea5f4..d6b569513e2 100644
--- a/ext/opcache/tests/issue0079.phpt
+++ b/ext/opcache/tests/issue0079.phpt
@@ -4,8 +4,8 @@ ISSUE #79 (Optimization Problem/Bug)
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class Test {
diff --git a/ext/opcache/tests/issue0115.phpt b/ext/opcache/tests/issue0115.phpt
index b8df30a1642..5e32e1f6fb6 100644
--- a/ext/opcache/tests/issue0115.phpt
+++ b/ext/opcache/tests/issue0115.phpt
@@ -4,9 +4,9 @@ ISSUE #115 (path issue when using phar)
 opcache.enable=1
 opcache.enable_cli=1
 phar.readonly=0
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+--EXTENSIONS--
+opcache
+phar
 --CONFLICTS--
 server
 --FILE--
diff --git a/ext/opcache/tests/issue0128.phpt b/ext/opcache/tests/issue0128.phpt
index 637f675ac25..95f2a54f209 100644
--- a/ext/opcache/tests/issue0128.phpt
+++ b/ext/opcache/tests/issue0128.phpt
@@ -4,8 +4,8 @@ ISSUE #128 (opcache_invalidate segmentation fault)
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 var_dump(opcache_invalidate('1'));
diff --git a/ext/opcache/tests/issue0140.phpt b/ext/opcache/tests/issue0140.phpt
index 78f711fce90..f61b812fef4 100644
--- a/ext/opcache/tests/issue0140.phpt
+++ b/ext/opcache/tests/issue0140.phpt
@@ -5,8 +5,9 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.revalidate_freq=0
 opcache.file_update_protection=0
+--EXTENSIONS--
+opcache
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow tests excluded by request") ?>
 --FILE--
 <?php
diff --git a/ext/opcache/tests/issue0149.phpt b/ext/opcache/tests/issue0149.phpt
index 0896e39d0c2..a72a4bc4ee6 100644
--- a/ext/opcache/tests/issue0149.phpt
+++ b/ext/opcache/tests/issue0149.phpt
@@ -4,9 +4,9 @@ ISSUE #149 (Phar mount points not working this OPcache enabled)
 opcache.enable=1
 opcache.enable_cli=1
 phar.readonly=0
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+--EXTENSIONS--
+opcache
+phar
 --CONFLICTS--
 server
 --FILE--
diff --git a/ext/opcache/tests/issue0183.phpt b/ext/opcache/tests/issue0183.phpt
index 49e9d78d394..961e8279304 100644
--- a/ext/opcache/tests/issue0183.phpt
+++ b/ext/opcache/tests/issue0183.phpt
@@ -4,8 +4,9 @@ ISSUE #183 (TMP_VAR is not only used once)
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
+--EXTENSIONS--
+opcache
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php if (PHP_OS != "Linux") die("skip, only for linux"); ?>
 --FILE--
 <?php
diff --git a/ext/opcache/tests/iterable_type_optimization.phpt b/ext/opcache/tests/iterable_type_optimization.phpt
index 146e1544e6b..277df8f374c 100644
--- a/ext/opcache/tests/iterable_type_optimization.phpt
+++ b/ext/opcache/tests/iterable_type_optimization.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Don't optimize object -> iterable
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/jit/array_elem.phpt b/ext/opcache/tests/jit/array_elem.phpt
index 542a8725437..301e14a4e19 100644
--- a/ext/opcache/tests/jit/array_elem.phpt
+++ b/ext/opcache/tests/jit/array_elem.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Refcount inference when adding array elements
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/jit/assign_001.phpt b/ext/opcache/tests/jit/assign_001.phpt
index 0c7f95944b5..5e98320a197 100644
--- a/ext/opcache/tests/jit/assign_001.phpt
+++ b/ext/opcache/tests/jit/assign_001.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_002.phpt b/ext/opcache/tests/jit/assign_002.phpt
index db00ce70c22..bcff9a452de 100644
--- a/ext/opcache/tests/jit/assign_002.phpt
+++ b/ext/opcache/tests/jit/assign_002.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_003.phpt b/ext/opcache/tests/jit/assign_003.phpt
index 5926391d815..3ce56a730e1 100644
--- a/ext/opcache/tests/jit/assign_003.phpt
+++ b/ext/opcache/tests/jit/assign_003.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_004.phpt b/ext/opcache/tests/jit/assign_004.phpt
index 097b5a15aae..27bfe722d14 100644
--- a/ext/opcache/tests/jit/assign_004.phpt
+++ b/ext/opcache/tests/jit/assign_004.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_005.phpt b/ext/opcache/tests/jit/assign_005.phpt
index b96044bdec1..5e923e0020c 100644
--- a/ext/opcache/tests/jit/assign_005.phpt
+++ b/ext/opcache/tests/jit/assign_005.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_006.phpt b/ext/opcache/tests/jit/assign_006.phpt
index c837f01a39f..5521e5267be 100644
--- a/ext/opcache/tests/jit/assign_006.phpt
+++ b/ext/opcache/tests/jit/assign_006.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_007.phpt b/ext/opcache/tests/jit/assign_007.phpt
index 2575c614d45..8567e351df5 100644
--- a/ext/opcache/tests/jit/assign_007.phpt
+++ b/ext/opcache/tests/jit/assign_007.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_008.phpt b/ext/opcache/tests/jit/assign_008.phpt
index c237711d0d8..f86483999a0 100644
--- a/ext/opcache/tests/jit/assign_008.phpt
+++ b/ext/opcache/tests/jit/assign_008.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_009.phpt b/ext/opcache/tests/jit/assign_009.phpt
index 3d3c5d1090f..2867436bc87 100644
--- a/ext/opcache/tests/jit/assign_009.phpt
+++ b/ext/opcache/tests/jit/assign_009.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_010.phpt b/ext/opcache/tests/jit/assign_010.phpt
index e38d368e76c..144e364c608 100644
--- a/ext/opcache/tests/jit/assign_010.phpt
+++ b/ext/opcache/tests/jit/assign_010.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_011.phpt b/ext/opcache/tests/jit/assign_011.phpt
index 71b051158bf..08dad919ff1 100644
--- a/ext/opcache/tests/jit/assign_011.phpt
+++ b/ext/opcache/tests/jit/assign_011.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_012.phpt b/ext/opcache/tests/jit/assign_012.phpt
index 81eb19e8491..b98de22be27 100644
--- a/ext/opcache/tests/jit/assign_012.phpt
+++ b/ext/opcache/tests/jit/assign_012.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_013.phpt b/ext/opcache/tests/jit/assign_013.phpt
index 2983593bf59..cde94fa06de 100644
--- a/ext/opcache/tests/jit/assign_013.phpt
+++ b/ext/opcache/tests/jit/assign_013.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_014.phpt b/ext/opcache/tests/jit/assign_014.phpt
index d488ae860d1..a5d80f6fac6 100644
--- a/ext/opcache/tests/jit/assign_014.phpt
+++ b/ext/opcache/tests/jit/assign_014.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_015.phpt b/ext/opcache/tests/jit/assign_015.phpt
index 233ef12d6e6..d4535fa2571 100644
--- a/ext/opcache/tests/jit/assign_015.phpt
+++ b/ext/opcache/tests/jit/assign_015.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_016.phpt b/ext/opcache/tests/jit/assign_016.phpt
index 4133d7bc0ee..16bbb68ebe6 100644
--- a/ext/opcache/tests/jit/assign_016.phpt
+++ b/ext/opcache/tests/jit/assign_016.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_017.phpt b/ext/opcache/tests/jit/assign_017.phpt
index fb4044d5db2..0c1424f764f 100644
--- a/ext/opcache/tests/jit/assign_017.phpt
+++ b/ext/opcache/tests/jit/assign_017.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_018.phpt b/ext/opcache/tests/jit/assign_018.phpt
index fb0029f6279..1e9e7095120 100644
--- a/ext/opcache/tests/jit/assign_018.phpt
+++ b/ext/opcache/tests/jit/assign_018.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_019.phpt b/ext/opcache/tests/jit/assign_019.phpt
index de150716d49..44caf4d9bcf 100644
--- a/ext/opcache/tests/jit/assign_019.phpt
+++ b/ext/opcache/tests/jit/assign_019.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_020.phpt b/ext/opcache/tests/jit/assign_020.phpt
index a92bc6d0773..bd54be51d4c 100644
--- a/ext/opcache/tests/jit/assign_020.phpt
+++ b/ext/opcache/tests/jit/assign_020.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_021.phpt b/ext/opcache/tests/jit/assign_021.phpt
index 01bf9f6d847..b0d5488efed 100644
--- a/ext/opcache/tests/jit/assign_021.phpt
+++ b/ext/opcache/tests/jit/assign_021.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_022.phpt b/ext/opcache/tests/jit/assign_022.phpt
index 187c9953668..b3b1a2f0972 100644
--- a/ext/opcache/tests/jit/assign_022.phpt
+++ b/ext/opcache/tests/jit/assign_022.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_023.phpt b/ext/opcache/tests/jit/assign_023.phpt
index 2c6a47b9801..4ca6ebe1065 100644
--- a/ext/opcache/tests/jit/assign_023.phpt
+++ b/ext/opcache/tests/jit/assign_023.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_024.phpt b/ext/opcache/tests/jit/assign_024.phpt
index 541089b3565..2967e9aa095 100644
--- a/ext/opcache/tests/jit/assign_024.phpt
+++ b/ext/opcache/tests/jit/assign_024.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_025.phpt b/ext/opcache/tests/jit/assign_025.phpt
index 4a5b20cd69f..2f69b0e87ad 100644
--- a/ext/opcache/tests/jit/assign_025.phpt
+++ b/ext/opcache/tests/jit/assign_025.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_026.phpt b/ext/opcache/tests/jit/assign_026.phpt
index ccebcf53cd5..92170aa1292 100644
--- a/ext/opcache/tests/jit/assign_026.phpt
+++ b/ext/opcache/tests/jit/assign_026.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_027.phpt b/ext/opcache/tests/jit/assign_027.phpt
index 12bc9d21094..776f833478b 100644
--- a/ext/opcache/tests/jit/assign_027.phpt
+++ b/ext/opcache/tests/jit/assign_027.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_028.phpt b/ext/opcache/tests/jit/assign_028.phpt
index 6111ffff6de..7c16da1b3f1 100644
--- a/ext/opcache/tests/jit/assign_028.phpt
+++ b/ext/opcache/tests/jit/assign_028.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_029.phpt b/ext/opcache/tests/jit/assign_029.phpt
index 2ead0eda371..8533865ac68 100644
--- a/ext/opcache/tests/jit/assign_029.phpt
+++ b/ext/opcache/tests/jit/assign_029.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_030.phpt b/ext/opcache/tests/jit/assign_030.phpt
index 90c5ba75e32..70576d48983 100644
--- a/ext/opcache/tests/jit/assign_030.phpt
+++ b/ext/opcache/tests/jit/assign_030.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_031.phpt b/ext/opcache/tests/jit/assign_031.phpt
index 7a2b3ad5828..2f17522e403 100644
--- a/ext/opcache/tests/jit/assign_031.phpt
+++ b/ext/opcache/tests/jit/assign_031.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 $c =& $a;
diff --git a/ext/opcache/tests/jit/assign_032.phpt b/ext/opcache/tests/jit/assign_032.phpt
index 448f924aed5..631953abfa2 100644
--- a/ext/opcache/tests/jit/assign_032.phpt
+++ b/ext/opcache/tests/jit/assign_032.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 $var = "intergalactic";
diff --git a/ext/opcache/tests/jit/assign_033.phpt b/ext/opcache/tests/jit/assign_033.phpt
index 931c0036fb4..2921967eb78 100644
--- a/ext/opcache/tests/jit/assign_033.phpt
+++ b/ext/opcache/tests/jit/assign_033.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo()
diff --git a/ext/opcache/tests/jit/assign_034.phpt b/ext/opcache/tests/jit/assign_034.phpt
index 253767f499d..b459ebcee80 100644
--- a/ext/opcache/tests/jit/assign_034.phpt
+++ b/ext/opcache/tests/jit/assign_034.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function bar() {
diff --git a/ext/opcache/tests/jit/assign_035.phpt b/ext/opcache/tests/jit/assign_035.phpt
index aebefc43910..6acc520c1e3 100644
--- a/ext/opcache/tests/jit/assign_035.phpt
+++ b/ext/opcache/tests/jit/assign_035.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/jit/assign_036.phpt b/ext/opcache/tests/jit/assign_036.phpt
index f7065f0d5e7..bbc47b3423f 100644
--- a/ext/opcache/tests/jit/assign_036.phpt
+++ b/ext/opcache/tests/jit/assign_036.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class A {
diff --git a/ext/opcache/tests/jit/assign_dim_002.phpt b/ext/opcache/tests/jit/assign_dim_002.phpt
index 5e7a7e9cfdb..feb80b7c400 100644
--- a/ext/opcache/tests/jit/assign_dim_002.phpt
+++ b/ext/opcache/tests/jit/assign_dim_002.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/assign_dim_op_001.phpt b/ext/opcache/tests/jit/assign_dim_op_001.phpt
index 256a6d5425c..0f481ba4834 100644
--- a/ext/opcache/tests/jit/assign_dim_op_001.phpt
+++ b/ext/opcache/tests/jit/assign_dim_op_001.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 $x = "a";
diff --git a/ext/opcache/tests/jit/assign_static_prop_001.phpt b/ext/opcache/tests/jit/assign_static_prop_001.phpt
index 2d90e39a20e..31109210a0f 100644
--- a/ext/opcache/tests/jit/assign_static_prop_001.phpt
+++ b/ext/opcache/tests/jit/assign_static_prop_001.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class Foo {
diff --git a/ext/opcache/tests/jit/bug77857.phpt b/ext/opcache/tests/jit/bug77857.phpt
index 27ab1d7305d..e62cb77d98c 100644
--- a/ext/opcache/tests/jit/bug77857.phpt
+++ b/ext/opcache/tests/jit/bug77857.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=64
 opcache.jit=1205
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function test() {
diff --git a/ext/opcache/tests/jit/bug79358.phpt b/ext/opcache/tests/jit/bug79358.phpt
index 1d794045a85..3ce9fd1a757 100644
--- a/ext/opcache/tests/jit/bug79358.phpt
+++ b/ext/opcache/tests/jit/bug79358.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #79358: JIT miscompile in composer
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/jit/bug79888.phpt b/ext/opcache/tests/jit/bug79888.phpt
index 02d4b62ea9c..ee18937ca06 100644
--- a/ext/opcache/tests/jit/bug79888.phpt
+++ b/ext/opcache/tests/jit/bug79888.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=64
 opcache.jit=1205
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function testPrime(int $a): bool {
diff --git a/ext/opcache/tests/jit/bug80426.phpt b/ext/opcache/tests/jit/bug80426.phpt
index c961bed4727..45218b7585b 100644
--- a/ext/opcache/tests/jit/bug80426.phpt
+++ b/ext/opcache/tests/jit/bug80426.phpt
@@ -5,8 +5,9 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.jit_buffer_size=1M
 zend_test.replace_zend_execute_ex=1
+--EXTENSIONS--
+opcache
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
 <?php if (!isset(opcache_get_status()["jit"])) die('skip: JIT is not available'); ?>
 <?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
 --FILE--
diff --git a/ext/opcache/tests/jit/bug80447.phpt b/ext/opcache/tests/jit/bug80447.phpt
index b09ff5c698a..15960e5e9c6 100644
--- a/ext/opcache/tests/jit/bug80447.phpt
+++ b/ext/opcache/tests/jit/bug80447.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function createTree($depth) {
diff --git a/ext/opcache/tests/jit/bug80634.phpt b/ext/opcache/tests/jit/bug80634.phpt
index 2e4b54aa139..328168c5285 100644
--- a/ext/opcache/tests/jit/bug80634.phpt
+++ b/ext/opcache/tests/jit/bug80634.phpt
@@ -8,9 +8,10 @@ opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 opcache.jit=function
 opcache.preload={PWD}/preload_bug80634.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/jit/bug80742.phpt b/ext/opcache/tests/jit/bug80742.phpt
index a86fe1052ba..76acbc58029 100644
--- a/ext/opcache/tests/jit/bug80742.phpt
+++ b/ext/opcache/tests/jit/bug80742.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #80742 (Opcache JIT makes some boolean logic unexpectedly be true)
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/jit/bug80745.phpt b/ext/opcache/tests/jit/bug80745.phpt
index 66956f4139f..ac81baadc9e 100644
--- a/ext/opcache/tests/jit/bug80745.phpt
+++ b/ext/opcache/tests/jit/bug80745.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit=function
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/jit/bug80782.phpt b/ext/opcache/tests/jit/bug80782.phpt
index c05987cbe24..40b6f1d9c69 100644
--- a/ext/opcache/tests/jit/bug80782.phpt
+++ b/ext/opcache/tests/jit/bug80782.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit=tracing
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 define('LONG_MIN', PHP_INT_MIN);
diff --git a/ext/opcache/tests/jit/bug80786.phpt b/ext/opcache/tests/jit/bug80786.phpt
index af4675111ee..517445579b7 100644
--- a/ext/opcache/tests/jit/bug80786.phpt
+++ b/ext/opcache/tests/jit/bug80786.phpt
@@ -5,6 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.jit_buffer_size=1M
 opcache.jit=function
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/jit/bug80802.phpt b/ext/opcache/tests/jit/bug80802.phpt
index 89a116cc92a..342912d655f 100644
--- a/ext/opcache/tests/jit/bug80802.phpt
+++ b/ext/opcache/tests/jit/bug80802.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.jit_buffer_size=1M
 opcache.jit=tracing
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 abstract class AsyncTask{
diff --git a/ext/opcache/tests/jit/bug80839.phpt b/ext/opcache/tests/jit/bug80839.phpt
index efa697ecdc1..632d64d6ac3 100644
--- a/ext/opcache/tests/jit/bug80839.phpt
+++ b/ext/opcache/tests/jit/bug80839.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.jit_buffer_size=1M
 opcache.jit=function
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 $a = null; // the problem only occurs when set to NULL
diff --git a/ext/opcache/tests/jit/bug80861.phpt b/ext/opcache/tests/jit/bug80861.phpt
index 3ae93d66d70..387f6725eef 100644
--- a/ext/opcache/tests/jit/bug80861.phpt
+++ b/ext/opcache/tests/jit/bug80861.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.jit_buffer_size=1M
 opcache.jit=tracing
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 declare(strict_types=1);
diff --git a/ext/opcache/tests/jit/cmp_001.phpt b/ext/opcache/tests/jit/cmp_001.phpt
index 7cbe312ca19..55bb595a1a6 100644
--- a/ext/opcache/tests/jit/cmp_001.phpt
+++ b/ext/opcache/tests/jit/cmp_001.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 $a = 0;
diff --git a/ext/opcache/tests/jit/cmp_002.phpt b/ext/opcache/tests/jit/cmp_002.phpt
index 8b02c975cd3..2dad9777536 100644
--- a/ext/opcache/tests/jit/cmp_002.phpt
+++ b/ext/opcache/tests/jit/cmp_002.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 $a = 0;
diff --git a/ext/opcache/tests/jit/cmp_003.phpt b/ext/opcache/tests/jit/cmp_003.phpt
index e7ed76a66ed..b9c83755299 100644
--- a/ext/opcache/tests/jit/cmp_003.phpt
+++ b/ext/opcache/tests/jit/cmp_003.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function t() {
diff --git a/ext/opcache/tests/jit/cmp_004.phpt b/ext/opcache/tests/jit/cmp_004.phpt
index 9a5772e3789..80eb6965be3 100644
--- a/ext/opcache/tests/jit/cmp_004.phpt
+++ b/ext/opcache/tests/jit/cmp_004.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo(bool $test, int $x) {
diff --git a/ext/opcache/tests/jit/const_001.phpt b/ext/opcache/tests/jit/const_001.phpt
index 67c9a0d1218..27d8b74febf 100644
--- a/ext/opcache/tests/jit/const_001.phpt
+++ b/ext/opcache/tests/jit/const_001.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function define_const() {
diff --git a/ext/opcache/tests/jit/count_001.phpt b/ext/opcache/tests/jit/count_001.phpt
index c76206f3aa9..4fefe6ab651 100644
--- a/ext/opcache/tests/jit/count_001.phpt
+++ b/ext/opcache/tests/jit/count_001.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class ThrowsInDestructor {
diff --git a/ext/opcache/tests/jit/defined_001.phpt b/ext/opcache/tests/jit/defined_001.phpt
index 76da7760c66..6ef0786d338 100644
--- a/ext/opcache/tests/jit/defined_001.phpt
+++ b/ext/opcache/tests/jit/defined_001.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.jit=1235
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo($i) {
diff --git a/ext/opcache/tests/jit/fetch_dim_func_args_001.phpt b/ext/opcache/tests/jit/fetch_dim_func_args_001.phpt
index b2e58c44b47..0fbbc5bb6f8 100644
--- a/ext/opcache/tests/jit/fetch_dim_func_args_001.phpt
+++ b/ext/opcache/tests/jit/fetch_dim_func_args_001.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 namespace A;
diff --git a/ext/opcache/tests/jit/fetch_dim_r_001.phpt b/ext/opcache/tests/jit/fetch_dim_r_001.phpt
index 9a630a47edc..6d320388362 100644
--- a/ext/opcache/tests/jit/fetch_dim_r_001.phpt
+++ b/ext/opcache/tests/jit/fetch_dim_r_001.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/fetch_dim_r_002.phpt b/ext/opcache/tests/jit/fetch_dim_r_002.phpt
index 566b0fa5bd4..98de4293e25 100644
--- a/ext/opcache/tests/jit/fetch_dim_r_002.phpt
+++ b/ext/opcache/tests/jit/fetch_dim_r_002.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo($n) {
diff --git a/ext/opcache/tests/jit/fetch_dim_r_003.phpt b/ext/opcache/tests/jit/fetch_dim_r_003.phpt
index 07c76854fb7..10f95475213 100644
--- a/ext/opcache/tests/jit/fetch_dim_r_003.phpt
+++ b/ext/opcache/tests/jit/fetch_dim_r_003.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/fetch_dim_r_004.phpt b/ext/opcache/tests/jit/fetch_dim_r_004.phpt
index 8e1fa714ce0..5731b21b069 100644
--- a/ext/opcache/tests/jit/fetch_dim_r_004.phpt
+++ b/ext/opcache/tests/jit/fetch_dim_r_004.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo($n) {
diff --git a/ext/opcache/tests/jit/fetch_dim_rw_001.phpt b/ext/opcache/tests/jit/fetch_dim_rw_001.phpt
index b5947cadd39..1402d63bb02 100644
--- a/ext/opcache/tests/jit/fetch_dim_rw_001.phpt
+++ b/ext/opcache/tests/jit/fetch_dim_rw_001.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/fetch_obj_001.phpt b/ext/opcache/tests/jit/fetch_obj_001.phpt
index 62631fa8932..e14ac9a27c2 100644
--- a/ext/opcache/tests/jit/fetch_obj_001.phpt
+++ b/ext/opcache/tests/jit/fetch_obj_001.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo(&$a) {
diff --git a/ext/opcache/tests/jit/fetch_obj_002.phpt b/ext/opcache/tests/jit/fetch_obj_002.phpt
index 463ff01b26b..470b08759f5 100644
--- a/ext/opcache/tests/jit/fetch_obj_002.phpt
+++ b/ext/opcache/tests/jit/fetch_obj_002.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class A {
diff --git a/ext/opcache/tests/jit/fetch_obj_003.phpt b/ext/opcache/tests/jit/fetch_obj_003.phpt
index de51b45fa7b..d1dc873c76e 100644
--- a/ext/opcache/tests/jit/fetch_obj_003.phpt
+++ b/ext/opcache/tests/jit/fetch_obj_003.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class C {
diff --git a/ext/opcache/tests/jit/fetch_obj_004.phpt b/ext/opcache/tests/jit/fetch_obj_004.phpt
index ec4d74f0e61..c999a940163 100644
--- a/ext/opcache/tests/jit/fetch_obj_004.phpt
+++ b/ext/opcache/tests/jit/fetch_obj_004.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class C {
diff --git a/ext/opcache/tests/jit/inc_001.phpt b/ext/opcache/tests/jit/inc_001.phpt
index 88e36448757..e418f832253 100644
--- a/ext/opcache/tests/jit/inc_001.phpt
+++ b/ext/opcache/tests/jit/inc_001.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/inc_002.phpt b/ext/opcache/tests/jit/inc_002.phpt
index 8fa7bde9a3c..88bff9c3f89 100644
--- a/ext/opcache/tests/jit/inc_002.phpt
+++ b/ext/opcache/tests/jit/inc_002.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/inc_003.phpt b/ext/opcache/tests/jit/inc_003.phpt
index cf13f5c4f12..cead1b50958 100644
--- a/ext/opcache/tests/jit/inc_003.phpt
+++ b/ext/opcache/tests/jit/inc_003.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/inc_004.phpt b/ext/opcache/tests/jit/inc_004.phpt
index eedf88b1b85..20f9ba02427 100644
--- a/ext/opcache/tests/jit/inc_004.phpt
+++ b/ext/opcache/tests/jit/inc_004.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/inc_005.phpt b/ext/opcache/tests/jit/inc_005.phpt
index 325aa753bb3..9e0e7f6f6c6 100644
--- a/ext/opcache/tests/jit/inc_005.phpt
+++ b/ext/opcache/tests/jit/inc_005.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/inc_006.phpt b/ext/opcache/tests/jit/inc_006.phpt
index a5ab397c38f..839e4f1093f 100644
--- a/ext/opcache/tests/jit/inc_006.phpt
+++ b/ext/opcache/tests/jit/inc_006.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/inc_007.phpt b/ext/opcache/tests/jit/inc_007.phpt
index e285d2730ed..74b678da0fb 100644
--- a/ext/opcache/tests/jit/inc_007.phpt
+++ b/ext/opcache/tests/jit/inc_007.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/inc_008.phpt b/ext/opcache/tests/jit/inc_008.phpt
index eff4bd041f7..8840aeb5d8b 100644
--- a/ext/opcache/tests/jit/inc_008.phpt
+++ b/ext/opcache/tests/jit/inc_008.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/inc_009.phpt b/ext/opcache/tests/jit/inc_009.phpt
index a87c82ae68a..8b5234ec9b8 100644
--- a/ext/opcache/tests/jit/inc_009.phpt
+++ b/ext/opcache/tests/jit/inc_009.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/inc_010.phpt b/ext/opcache/tests/jit/inc_010.phpt
index fa6b27e8ff4..1def045dc0f 100644
--- a/ext/opcache/tests/jit/inc_010.phpt
+++ b/ext/opcache/tests/jit/inc_010.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/inc_011.phpt b/ext/opcache/tests/jit/inc_011.phpt
index 051affc8a41..8c09dd93c65 100644
--- a/ext/opcache/tests/jit/inc_011.phpt
+++ b/ext/opcache/tests/jit/inc_011.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/inc_012.phpt b/ext/opcache/tests/jit/inc_012.phpt
index 7a6dd24ea73..5db9297ce16 100644
--- a/ext/opcache/tests/jit/inc_012.phpt
+++ b/ext/opcache/tests/jit/inc_012.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/inc_013.phpt b/ext/opcache/tests/jit/inc_013.phpt
index daa09ddad69..3f6ad206026 100644
--- a/ext/opcache/tests/jit/inc_013.phpt
+++ b/ext/opcache/tests/jit/inc_013.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/inc_014.phpt b/ext/opcache/tests/jit/inc_014.phpt
index 381d506e31f..afe470d8d91 100644
--- a/ext/opcache/tests/jit/inc_014.phpt
+++ b/ext/opcache/tests/jit/inc_014.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/inc_015.phpt b/ext/opcache/tests/jit/inc_015.phpt
index 0573610587d..e4eeac1c0f5 100644
--- a/ext/opcache/tests/jit/inc_015.phpt
+++ b/ext/opcache/tests/jit/inc_015.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/inc_016.phpt b/ext/opcache/tests/jit/inc_016.phpt
index 1a53043a14a..1cf506b31b6 100644
--- a/ext/opcache/tests/jit/inc_016.phpt
+++ b/ext/opcache/tests/jit/inc_016.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/inc_017.phpt b/ext/opcache/tests/jit/inc_017.phpt
index 3f47bfe87a0..1d7c0f3d7b9 100644
--- a/ext/opcache/tests/jit/inc_017.phpt
+++ b/ext/opcache/tests/jit/inc_017.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/inc_018.phpt b/ext/opcache/tests/jit/inc_018.phpt
index 25f085a62e2..65c5f0e04ae 100644
--- a/ext/opcache/tests/jit/inc_018.phpt
+++ b/ext/opcache/tests/jit/inc_018.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/jit/inc_019.phpt b/ext/opcache/tests/jit/inc_019.phpt
index d9e5e9b5886..b25b8279b8d 100644
--- a/ext/opcache/tests/jit/inc_019.phpt
+++ b/ext/opcache/tests/jit/inc_019.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function bar($b) {
diff --git a/ext/opcache/tests/jit/inc_020.phpt b/ext/opcache/tests/jit/inc_020.phpt
index 5b3530d6e1c..a207aae65e9 100644
--- a/ext/opcache/tests/jit/inc_020.phpt
+++ b/ext/opcache/tests/jit/inc_020.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo($row) {
diff --git a/ext/opcache/tests/jit/ini_leading_zero.phpt b/ext/opcache/tests/jit/ini_leading_zero.phpt
index 5e9d38d409f..affe5c27060 100644
--- a/ext/opcache/tests/jit/ini_leading_zero.phpt
+++ b/ext/opcache/tests/jit/ini_leading_zero.phpt
@@ -4,8 +4,8 @@ Leading zero in opcache.jit option
 opcache.enable=1
 opcache.enable_cli=1
 opcache.jit=0205
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 ===DONE===
 --EXPECT--
diff --git a/ext/opcache/tests/jit/jmpz_001.phpt b/ext/opcache/tests/jit/jmpz_001.phpt
index 2772942f39c..031ff1bfb6e 100644
--- a/ext/opcache/tests/jit/jmpz_001.phpt
+++ b/ext/opcache/tests/jit/jmpz_001.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 namespace A;
diff --git a/ext/opcache/tests/jit/jmpz_ex_001.phpt b/ext/opcache/tests/jit/jmpz_ex_001.phpt
index c001fb9b69f..bacd1d42ee9 100644
--- a/ext/opcache/tests/jit/jmpz_ex_001.phpt
+++ b/ext/opcache/tests/jit/jmpz_ex_001.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class Test {
diff --git a/ext/opcache/tests/jit/method_call_001.phpt b/ext/opcache/tests/jit/method_call_001.phpt
index 2d96d359e07..8491401c1c0 100644
--- a/ext/opcache/tests/jit/method_call_001.phpt
+++ b/ext/opcache/tests/jit/method_call_001.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function &foo() {
diff --git a/ext/opcache/tests/jit/mod_001.phpt b/ext/opcache/tests/jit/mod_001.phpt
index d9dd638f634..622f38da1d6 100644
--- a/ext/opcache/tests/jit/mod_001.phpt
+++ b/ext/opcache/tests/jit/mod_001.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function mod(int $a, int $b) {
diff --git a/ext/opcache/tests/jit/mod_002.phpt b/ext/opcache/tests/jit/mod_002.phpt
index 9dada5e400c..0a33c546bd4 100644
--- a/ext/opcache/tests/jit/mod_002.phpt
+++ b/ext/opcache/tests/jit/mod_002.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function mod33(int $a) {
diff --git a/ext/opcache/tests/jit/noval_001.phpt b/ext/opcache/tests/jit/noval_001.phpt
index 47a7dc04814..4211219a5b3 100644
--- a/ext/opcache/tests/jit/noval_001.phpt
+++ b/ext/opcache/tests/jit/noval_001.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class Foo {
diff --git a/ext/opcache/tests/jit/recv_001.phpt b/ext/opcache/tests/jit/recv_001.phpt
index b941786bb4c..98087d09dd4 100644
--- a/ext/opcache/tests/jit/recv_001.phpt
+++ b/ext/opcache/tests/jit/recv_001.phpt
@@ -7,8 +7,8 @@ opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/jit/reg_alloc_001.phpt b/ext/opcache/tests/jit/reg_alloc_001.phpt
index 609ed8e27fc..c7dadb1974c 100644
--- a/ext/opcache/tests/jit/reg_alloc_001.phpt
+++ b/ext/opcache/tests/jit/reg_alloc_001.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class Caster
diff --git a/ext/opcache/tests/jit/reg_alloc_002.phpt b/ext/opcache/tests/jit/reg_alloc_002.phpt
index 55931561880..5b58133477e 100644
--- a/ext/opcache/tests/jit/reg_alloc_002.phpt
+++ b/ext/opcache/tests/jit/reg_alloc_002.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class A {
diff --git a/ext/opcache/tests/jit/reg_alloc_003.phpt b/ext/opcache/tests/jit/reg_alloc_003.phpt
index f1a90dcec4c..4355089ec25 100644
--- a/ext/opcache/tests/jit/reg_alloc_003.phpt
+++ b/ext/opcache/tests/jit/reg_alloc_003.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function test($char_code) {
diff --git a/ext/opcache/tests/jit/send_ref_001.phpt b/ext/opcache/tests/jit/send_ref_001.phpt
index 55a2359038b..c18bee9cc5c 100644
--- a/ext/opcache/tests/jit/send_ref_001.phpt
+++ b/ext/opcache/tests/jit/send_ref_001.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo(&$obj) {
diff --git a/ext/opcache/tests/jit/send_val_001.phpt b/ext/opcache/tests/jit/send_val_001.phpt
index dc5980f6e3a..527bdef52b9 100644
--- a/ext/opcache/tests/jit/send_val_001.phpt
+++ b/ext/opcache/tests/jit/send_val_001.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo($type) {
diff --git a/ext/opcache/tests/jit/send_var_ex_001.phpt b/ext/opcache/tests/jit/send_var_ex_001.phpt
index 176f7502f5f..0081cab2121 100644
--- a/ext/opcache/tests/jit/send_var_ex_001.phpt
+++ b/ext/opcache/tests/jit/send_var_ex_001.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 ;opcache.jit_debug=257
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 namespace A;
diff --git a/ext/opcache/tests/jit/shift_left_001.phpt b/ext/opcache/tests/jit/shift_left_001.phpt
index 4447d0943e6..543aa992a5a 100644
--- a/ext/opcache/tests/jit/shift_left_001.phpt
+++ b/ext/opcache/tests/jit/shift_left_001.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function shl(int $a, int $b) {
diff --git a/ext/opcache/tests/jit/shift_left_002.phpt b/ext/opcache/tests/jit/shift_left_002.phpt
index a6478373b96..661b033d1ce 100644
--- a/ext/opcache/tests/jit/shift_left_002.phpt
+++ b/ext/opcache/tests/jit/shift_left_002.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function shl0(int $a) {
diff --git a/ext/opcache/tests/jit/shift_right_001.phpt b/ext/opcache/tests/jit/shift_right_001.phpt
index 01a547b9eaf..51605d2f139 100644
--- a/ext/opcache/tests/jit/shift_right_001.phpt
+++ b/ext/opcache/tests/jit/shift_right_001.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function shr(int $a, int $b) {
diff --git a/ext/opcache/tests/jit/shift_right_002.phpt b/ext/opcache/tests/jit/shift_right_002.phpt
index 3d86a08116c..e5f8e982b08 100644
--- a/ext/opcache/tests/jit/shift_right_002.phpt
+++ b/ext/opcache/tests/jit/shift_right_002.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function shr0(int $a) {
diff --git a/ext/opcache/tests/jit/shift_right_003.phpt b/ext/opcache/tests/jit/shift_right_003.phpt
index 7fdf601d64e..175463e66ec 100644
--- a/ext/opcache/tests/jit/shift_right_003.phpt
+++ b/ext/opcache/tests/jit/shift_right_003.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function encodeDynamicInteger(int $int): string {
diff --git a/ext/opcache/tests/jit/skipif.inc b/ext/opcache/tests/jit/skipif.inc
deleted file mode 100644
index c5a81810391..00000000000
--- a/ext/opcache/tests/jit/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  if (!extension_loaded('Zend OPcache')) die('skip Zend OPcache extension not available');
-?>
diff --git a/ext/opcache/tests/jit/switch_jumptable.phpt b/ext/opcache/tests/jit/switch_jumptable.phpt
index df59a48c145..a688b727ec0 100644
--- a/ext/opcache/tests/jit/switch_jumptable.phpt
+++ b/ext/opcache/tests/jit/switch_jumptable.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/jit/trampoline_001.phpt b/ext/opcache/tests/jit/trampoline_001.phpt
index 95041257a7b..e68d0cdd923 100644
--- a/ext/opcache/tests/jit/trampoline_001.phpt
+++ b/ext/opcache/tests/jit/trampoline_001.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.jit=tracing
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class A {
diff --git a/ext/opcache/tests/jit/trampoline_002.phpt b/ext/opcache/tests/jit/trampoline_002.phpt
index 10e02e864e2..c3dc5565d6c 100644
--- a/ext/opcache/tests/jit/trampoline_002.phpt
+++ b/ext/opcache/tests/jit/trampoline_002.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.jit=tracing
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class A {
diff --git a/ext/opcache/tests/jit/type_check_001.phpt b/ext/opcache/tests/jit/type_check_001.phpt
index 5b5afc870b6..4d37ba7b976 100644
--- a/ext/opcache/tests/jit/type_check_001.phpt
+++ b/ext/opcache/tests/jit/type_check_001.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 set_error_handler(function($no, $msg) {
diff --git a/ext/opcache/tests/jit/unreachable_block.phpt b/ext/opcache/tests/jit/unreachable_block.phpt
index cf60efaef3c..adb870e8578 100644
--- a/ext/opcache/tests/jit/unreachable_block.phpt
+++ b/ext/opcache/tests/jit/unreachable_block.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.jit_buffer_size=1M
 opcache.protect_memory=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class A {
diff --git a/ext/opcache/tests/jmp_elim_001.phpt b/ext/opcache/tests/jmp_elim_001.phpt
index 4cc965388fd..49ef3e7748c 100644
--- a/ext/opcache/tests/jmp_elim_001.phpt
+++ b/ext/opcache/tests/jmp_elim_001.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Edge-cases in constant conditional jump elimination
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php if (PHP_INT_SIZE != 8) die("skip for machines with 64-bit longs"); ?>
-<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 $webserver = "Apache";
diff --git a/ext/opcache/tests/jmp_elim_002.phpt b/ext/opcache/tests/jmp_elim_002.phpt
index e396ca0a9dd..71c9ce9b11f 100644
--- a/ext/opcache/tests/jmp_elim_002.phpt
+++ b/ext/opcache/tests/jmp_elim_002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Incorrect empty basic block elimination
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function wp_get_archives( $args = '' ) {
diff --git a/ext/opcache/tests/jmp_elim_003.phpt b/ext/opcache/tests/jmp_elim_003.phpt
index 55be9632bab..dc611a209fb 100644
--- a/ext/opcache/tests/jmp_elim_003.phpt
+++ b/ext/opcache/tests/jmp_elim_003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Incorrect empty basic block elimination
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class A {
diff --git a/ext/opcache/tests/jmp_elim_004.phpt b/ext/opcache/tests/jmp_elim_004.phpt
index 8834ab4e85c..360a5ff1597 100644
--- a/ext/opcache/tests/jmp_elim_004.phpt
+++ b/ext/opcache/tests/jmp_elim_004.phpt
@@ -3,8 +3,8 @@ Incorrect empty basic block elimination
 --INI--
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/jmpz_jmp_elim.phpt b/ext/opcache/tests/jmpz_jmp_elim.phpt
index 546275dcde7..cb25196ae5d 100644
--- a/ext/opcache/tests/jmpz_jmp_elim.phpt
+++ b/ext/opcache/tests/jmpz_jmp_elim.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Edge-cases in elimination of JMPZ JMP with same target
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/leak_001.phpt b/ext/opcache/tests/leak_001.phpt
index c590943fcbb..7f5e792bd2a 100644
--- a/ext/opcache/tests/leak_001.phpt
+++ b/ext/opcache/tests/leak_001.phpt
@@ -4,8 +4,8 @@ Leak 001: Incorrect 'if ();' optimization
 opcache.enable=1
 opcache.enable_cli=1
 opcache.file_cache_only=0
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 if (false);
diff --git a/ext/opcache/tests/log_verbosity_bug.phpt b/ext/opcache/tests/log_verbosity_bug.phpt
index a2c2f4f30af..f4f0ba279a1 100644
--- a/ext/opcache/tests/log_verbosity_bug.phpt
+++ b/ext/opcache/tests/log_verbosity_bug.phpt
@@ -11,9 +11,10 @@ opcache.file_cache_only=0
 opcache.file_cache_fallback=0
 opcache.memory_consumption=999999999
 opcache.log_verbosity_level=-1
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (getenv('SKIP_ASAN')) die('xfail Startup failure leak');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/match/001.phpt b/ext/opcache/tests/match/001.phpt
index 03770d2e957..37f564b5bbc 100644
--- a/ext/opcache/tests/match/001.phpt
+++ b/ext/opcache/tests/match/001.phpt
@@ -4,8 +4,8 @@ Match expression string jump table
 opcache.enable=1
 opcache.enable_cli=1
 opcache.opt_debug_level=0x20000
---SKIPIF--
-<?php require_once(__DIR__ . '/../skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/match/002.phpt b/ext/opcache/tests/match/002.phpt
index 73001bc0206..3743d6bed79 100644
--- a/ext/opcache/tests/match/002.phpt
+++ b/ext/opcache/tests/match/002.phpt
@@ -4,8 +4,8 @@ Test match jump table optimizer
 opcache.enable=1
 opcache.enable_cli=1
 opcache.opt_debug_level=0x20000
---SKIPIF--
-<?php require_once(__DIR__ . '/../skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/match/003.phpt b/ext/opcache/tests/match/003.phpt
index ff430d9ec8c..9e55cbba942 100644
--- a/ext/opcache/tests/match/003.phpt
+++ b/ext/opcache/tests/match/003.phpt
@@ -4,8 +4,8 @@ Match expression long jump table
 opcache.enable=1
 opcache.enable_cli=1
 opcache.opt_debug_level=0x20000
---SKIPIF--
-<?php require_once(__DIR__ . '/../skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/match/004.phpt b/ext/opcache/tests/match/004.phpt
index f7fed6d76cb..551c9a5d0e1 100644
--- a/ext/opcache/tests/match/004.phpt
+++ b/ext/opcache/tests/match/004.phpt
@@ -4,8 +4,8 @@ Match expression mixed jump table
 opcache.enable=1
 opcache.enable_cli=1
 opcache.opt_debug_level=0x20000
---SKIPIF--
-<?php require_once(__DIR__ . '/../skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/method_call_on_literal.phpt b/ext/opcache/tests/method_call_on_literal.phpt
index 3a7b04c8e7e..50b0076c401 100644
--- a/ext/opcache/tests/method_call_on_literal.phpt
+++ b/ext/opcache/tests/method_call_on_literal.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Literal compaction should take method calls on literals into account
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/neg_range_inference.phpt b/ext/opcache/tests/neg_range_inference.phpt
index e24ac3f7a2d..ba25577e222 100644
--- a/ext/opcache/tests/neg_range_inference.phpt
+++ b/ext/opcache/tests/neg_range_inference.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Incorrect negative range inference
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/opt/block_pass_001.phpt b/ext/opcache/tests/opt/block_pass_001.phpt
index 788994ea4e0..573f6958b09 100644
--- a/ext/opcache/tests/opt/block_pass_001.phpt
+++ b/ext/opcache/tests/opt/block_pass_001.phpt
@@ -4,8 +4,8 @@ Block Pass 001: QM_ASSIGN and DECLARE_LAMBDA_FUNCTION
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 abstract class Broadcaster {
diff --git a/ext/opcache/tests/opt/block_pass_002.phpt b/ext/opcache/tests/opt/block_pass_002.phpt
index 38722ea49bd..ad6ea0b8ad0 100644
--- a/ext/opcache/tests/opt/block_pass_002.phpt
+++ b/ext/opcache/tests/opt/block_pass_002.phpt
@@ -4,8 +4,8 @@ Block Pass 002: QM_ASSIGN and INIT_ARRAY
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo($key, $value, array $attributes) {
diff --git a/ext/opcache/tests/opt/coalesce.phpt b/ext/opcache/tests/opt/coalesce.phpt
index 94934fe602e..66a2e7f8274 100644
--- a/ext/opcache/tests/opt/coalesce.phpt
+++ b/ext/opcache/tests/opt/coalesce.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/opt/dce_001.phpt b/ext/opcache/tests/opt/dce_001.phpt
index d3578f1791b..81e309fa496 100644
--- a/ext/opcache/tests/opt/dce_001.phpt
+++ b/ext/opcache/tests/opt/dce_001.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo(string $s1, string $s2, string $s3, string $s4) {
diff --git a/ext/opcache/tests/opt/dce_002.phpt b/ext/opcache/tests/opt/dce_002.phpt
index 73b19020791..2f105fe352b 100644
--- a/ext/opcache/tests/opt/dce_002.phpt
+++ b/ext/opcache/tests/opt/dce_002.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo(int $a) {
diff --git a/ext/opcache/tests/opt/dce_003.phpt b/ext/opcache/tests/opt/dce_003.phpt
index f31b2b20756..5824eae5523 100644
--- a/ext/opcache/tests/opt/dce_003.phpt
+++ b/ext/opcache/tests/opt/dce_003.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo(int $a) {
diff --git a/ext/opcache/tests/opt/dce_004.phpt b/ext/opcache/tests/opt/dce_004.phpt
index cdde1d87774..b49caceb0d7 100644
--- a/ext/opcache/tests/opt/dce_004.phpt
+++ b/ext/opcache/tests/opt/dce_004.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo(int $x, int $y) {
diff --git a/ext/opcache/tests/opt/dce_005.phpt b/ext/opcache/tests/opt/dce_005.phpt
index 9f9931b174d..7c90a971505 100644
--- a/ext/opcache/tests/opt/dce_005.phpt
+++ b/ext/opcache/tests/opt/dce_005.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class A {
diff --git a/ext/opcache/tests/opt/dce_006.phpt b/ext/opcache/tests/opt/dce_006.phpt
index 21b7163db99..97d29887939 100644
--- a/ext/opcache/tests/opt/dce_006.phpt
+++ b/ext/opcache/tests/opt/dce_006.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class A {
diff --git a/ext/opcache/tests/opt/dce_007.phpt b/ext/opcache/tests/opt/dce_007.phpt
index e7280b4710d..0f4da98d059 100644
--- a/ext/opcache/tests/opt/dce_007.phpt
+++ b/ext/opcache/tests/opt/dce_007.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function esc($x) {
diff --git a/ext/opcache/tests/opt/dce_008.phpt b/ext/opcache/tests/opt/dce_008.phpt
index 31d0fc8b1bb..0a55d83fb83 100644
--- a/ext/opcache/tests/opt/dce_008.phpt
+++ b/ext/opcache/tests/opt/dce_008.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function esc(int $x) {
diff --git a/ext/opcache/tests/opt/dce_009.phpt b/ext/opcache/tests/opt/dce_009.phpt
index 0503614f346..ea3032460cf 100644
--- a/ext/opcache/tests/opt/dce_009.phpt
+++ b/ext/opcache/tests/opt/dce_009.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class Loop {
diff --git a/ext/opcache/tests/opt/jmp_001.phpt b/ext/opcache/tests/opt/jmp_001.phpt
index e37a080d15a..23cd2f796a4 100644
--- a/ext/opcache/tests/opt/jmp_001.phpt
+++ b/ext/opcache/tests/opt/jmp_001.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function test() {
diff --git a/ext/opcache/tests/opt/nullsafe_001.phpt b/ext/opcache/tests/opt/nullsafe_001.phpt
index 37e1d1724c6..f0c31756413 100644
--- a/ext/opcache/tests/opt/nullsafe_001.phpt
+++ b/ext/opcache/tests/opt/nullsafe_001.phpt
@@ -4,8 +4,8 @@ Nullsafe basic optimization
 opcache.enable=1
 opcache.enable_cli=1
 opcache.opt_debug_level=0x20000
---SKIPIF--
-<?php require_once(__DIR__ . '/../skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/opt/nullsafe_002.phpt b/ext/opcache/tests/opt/nullsafe_002.phpt
index 099fce11f00..32dc25de158 100644
--- a/ext/opcache/tests/opt/nullsafe_002.phpt
+++ b/ext/opcache/tests/opt/nullsafe_002.phpt
@@ -4,8 +4,8 @@ Nullsafe e-ssa pi node placement
 opcache.enable=1
 opcache.enable_cli=1
 opcache.opt_debug_level=0x200000
---SKIPIF--
-<?php require_once(__DIR__ . '/../skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/opt/prop_types.phpt b/ext/opcache/tests/opt/prop_types.phpt
index c5858999d02..063a7f04efc 100644
--- a/ext/opcache/tests/opt/prop_types.phpt
+++ b/ext/opcache/tests/opt/prop_types.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x200000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/opt/sccp_001.phpt b/ext/opcache/tests/opt/sccp_001.phpt
index d55f0a99849..20869eb6245 100644
--- a/ext/opcache/tests/opt/sccp_001.phpt
+++ b/ext/opcache/tests/opt/sccp_001.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/opt/sccp_002.phpt b/ext/opcache/tests/opt/sccp_002.phpt
index 500855b3f16..7dda1932e0f 100644
--- a/ext/opcache/tests/opt/sccp_002.phpt
+++ b/ext/opcache/tests/opt/sccp_002.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo(int $x) {
diff --git a/ext/opcache/tests/opt/sccp_003.phpt b/ext/opcache/tests/opt/sccp_003.phpt
index 46dc4ae7d84..3002efcc4a1 100644
--- a/ext/opcache/tests/opt/sccp_003.phpt
+++ b/ext/opcache/tests/opt/sccp_003.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/opt/sccp_004.phpt b/ext/opcache/tests/opt/sccp_004.phpt
index 4d1b2a4843d..891fa0ed473 100644
--- a/ext/opcache/tests/opt/sccp_004.phpt
+++ b/ext/opcache/tests/opt/sccp_004.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo(int $x) {
diff --git a/ext/opcache/tests/opt/sccp_005.phpt b/ext/opcache/tests/opt/sccp_005.phpt
index 8f83b423995..1f56feee320 100644
--- a/ext/opcache/tests/opt/sccp_005.phpt
+++ b/ext/opcache/tests/opt/sccp_005.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo(int $x) {
diff --git a/ext/opcache/tests/opt/sccp_006.phpt b/ext/opcache/tests/opt/sccp_006.phpt
index d1cf79d7607..c8b6253e5c7 100644
--- a/ext/opcache/tests/opt/sccp_006.phpt
+++ b/ext/opcache/tests/opt/sccp_006.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo(int $x) {
diff --git a/ext/opcache/tests/opt/sccp_007.phpt b/ext/opcache/tests/opt/sccp_007.phpt
index 1850b3b73fb..112b7791910 100644
--- a/ext/opcache/tests/opt/sccp_007.phpt
+++ b/ext/opcache/tests/opt/sccp_007.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo(int $x) {
diff --git a/ext/opcache/tests/opt/sccp_008.phpt b/ext/opcache/tests/opt/sccp_008.phpt
index bb4f6895d8e..f194249d351 100644
--- a/ext/opcache/tests/opt/sccp_008.phpt
+++ b/ext/opcache/tests/opt/sccp_008.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo(int $x) {
diff --git a/ext/opcache/tests/opt/sccp_009.phpt b/ext/opcache/tests/opt/sccp_009.phpt
index 17c6b57f332..ca5ba96bc0c 100644
--- a/ext/opcache/tests/opt/sccp_009.phpt
+++ b/ext/opcache/tests/opt/sccp_009.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo(int $x) {
diff --git a/ext/opcache/tests/opt/sccp_010.phpt b/ext/opcache/tests/opt/sccp_010.phpt
index 1a57c497bf7..e9dba9978cf 100644
--- a/ext/opcache/tests/opt/sccp_010.phpt
+++ b/ext/opcache/tests/opt/sccp_010.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/opt/sccp_011.phpt b/ext/opcache/tests/opt/sccp_011.phpt
index b6dfdfe5348..cba27a0f245 100644
--- a/ext/opcache/tests/opt/sccp_011.phpt
+++ b/ext/opcache/tests/opt/sccp_011.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo(int $x) {
diff --git a/ext/opcache/tests/opt/sccp_012.phpt b/ext/opcache/tests/opt/sccp_012.phpt
index 08d271307e2..203de5fa56a 100644
--- a/ext/opcache/tests/opt/sccp_012.phpt
+++ b/ext/opcache/tests/opt/sccp_012.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/opt/sccp_013.phpt b/ext/opcache/tests/opt/sccp_013.phpt
index 1ed9c7703b8..786c7665474 100644
--- a/ext/opcache/tests/opt/sccp_013.phpt
+++ b/ext/opcache/tests/opt/sccp_013.phpt
@@ -4,8 +4,8 @@ SCCP 013: Conditional Constant Propagation of non-escaping array elements on PHI
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function loadEntities($entity_information) {
diff --git a/ext/opcache/tests/opt/sccp_014.phpt b/ext/opcache/tests/opt/sccp_014.phpt
index 81f21a4ab06..b40afdbbfb8 100644
--- a/ext/opcache/tests/opt/sccp_014.phpt
+++ b/ext/opcache/tests/opt/sccp_014.phpt
@@ -4,8 +4,8 @@ SCCP 014: Conditional Constant Propagation of non-escaping object properties on
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function loadEntities($entity_information) {
diff --git a/ext/opcache/tests/opt/sccp_015.phpt b/ext/opcache/tests/opt/sccp_015.phpt
index d11bd6c9e06..91c78236fd4 100644
--- a/ext/opcache/tests/opt/sccp_015.phpt
+++ b/ext/opcache/tests/opt/sccp_015.phpt
@@ -4,8 +4,8 @@ SCCP 015: Conditional Constant Propagation of non-escaping object properties on
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function loadEntities($entity_information) {
diff --git a/ext/opcache/tests/opt/sccp_016.phpt b/ext/opcache/tests/opt/sccp_016.phpt
index 0ce1bbec1e2..46154ad9f04 100644
--- a/ext/opcache/tests/opt/sccp_016.phpt
+++ b/ext/opcache/tests/opt/sccp_016.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 return isset($undef) || php_sapi_name() == php_sapi_name();
diff --git a/ext/opcache/tests/opt/sccp_017.phpt b/ext/opcache/tests/opt/sccp_017.phpt
index 6d068b3371f..43cdc2ed2b6 100644
--- a/ext/opcache/tests/opt/sccp_017.phpt
+++ b/ext/opcache/tests/opt/sccp_017.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo(int $x) {
diff --git a/ext/opcache/tests/opt/sccp_018.phpt b/ext/opcache/tests/opt/sccp_018.phpt
index e7a78ef50d6..a1ca9fe86f2 100644
--- a/ext/opcache/tests/opt/sccp_018.phpt
+++ b/ext/opcache/tests/opt/sccp_018.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 ;opcache.opt_debug_level=0x20000
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/opt/sccp_019.phpt b/ext/opcache/tests/opt/sccp_019.phpt
index 427b6d16a31..e3453cd257f 100644
--- a/ext/opcache/tests/opt/sccp_019.phpt
+++ b/ext/opcache/tests/opt/sccp_019.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo(int $x) {
diff --git a/ext/opcache/tests/opt/sccp_020.phpt b/ext/opcache/tests/opt/sccp_020.phpt
index be972f4fdf5..8fcaf1bb003 100644
--- a/ext/opcache/tests/opt/sccp_020.phpt
+++ b/ext/opcache/tests/opt/sccp_020.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 ;opcache.opt_debug_level=0x20000
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/opt/sccp_021.phpt b/ext/opcache/tests/opt/sccp_021.phpt
index 1eb8de4516a..6162876962b 100644
--- a/ext/opcache/tests/opt/sccp_021.phpt
+++ b/ext/opcache/tests/opt/sccp_021.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 ;opcache.opt_debug_level=0x20000
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class A {
diff --git a/ext/opcache/tests/opt/sccp_022.phpt b/ext/opcache/tests/opt/sccp_022.phpt
index ed40252a2bf..150b22ee3a7 100644
--- a/ext/opcache/tests/opt/sccp_022.phpt
+++ b/ext/opcache/tests/opt/sccp_022.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo(int $x) {
diff --git a/ext/opcache/tests/opt/sccp_023.phpt b/ext/opcache/tests/opt/sccp_023.phpt
index efa7d6b0134..be19b8fd74f 100644
--- a/ext/opcache/tests/opt/sccp_023.phpt
+++ b/ext/opcache/tests/opt/sccp_023.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function a ($field_type, $allowed_values) {
diff --git a/ext/opcache/tests/opt/sccp_024.phpt b/ext/opcache/tests/opt/sccp_024.phpt
index 040baf9d8bf..5fd33e2b7e1 100644
--- a/ext/opcache/tests/opt/sccp_024.phpt
+++ b/ext/opcache/tests/opt/sccp_024.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class A {
diff --git a/ext/opcache/tests/opt/sccp_025.phpt b/ext/opcache/tests/opt/sccp_025.phpt
index f78e8822d76..20ffe8e1e1c 100644
--- a/ext/opcache/tests/opt/sccp_025.phpt
+++ b/ext/opcache/tests/opt/sccp_025.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function test($phpEx)
diff --git a/ext/opcache/tests/opt/sccp_026.phpt b/ext/opcache/tests/opt/sccp_026.phpt
index 7b2ca4b44e8..6d2108409b0 100644
--- a/ext/opcache/tests/opt/sccp_026.phpt
+++ b/ext/opcache/tests/opt/sccp_026.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function test($var) {
diff --git a/ext/opcache/tests/opt/sccp_027.phpt b/ext/opcache/tests/opt/sccp_027.phpt
index 5c13111d1c9..a9f35a54a98 100644
--- a/ext/opcache/tests/opt/sccp_027.phpt
+++ b/ext/opcache/tests/opt/sccp_027.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class Foo {
diff --git a/ext/opcache/tests/opt/sccp_028.phpt b/ext/opcache/tests/opt/sccp_028.phpt
index a916b3af14b..44d486b3106 100644
--- a/ext/opcache/tests/opt/sccp_028.phpt
+++ b/ext/opcache/tests/opt/sccp_028.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/opt/sccp_029.phpt b/ext/opcache/tests/opt/sccp_029.phpt
index 99459f74af5..bd81136947a 100644
--- a/ext/opcache/tests/opt/sccp_029.phpt
+++ b/ext/opcache/tests/opt/sccp_029.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/opt/sccp_030.phpt b/ext/opcache/tests/opt/sccp_030.phpt
index fbaecc1e924..469981f4a75 100644
--- a/ext/opcache/tests/opt/sccp_030.phpt
+++ b/ext/opcache/tests/opt/sccp_030.phpt
@@ -5,8 +5,8 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/opt/sccp_031.phpt b/ext/opcache/tests/opt/sccp_031.phpt
index 097c96bcf8f..73b5906df64 100644
--- a/ext/opcache/tests/opt/sccp_031.phpt
+++ b/ext/opcache/tests/opt/sccp_031.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/opt/sccp_032.phpt b/ext/opcache/tests/opt/sccp_032.phpt
index e7d9e489919..9a03fe4e1d5 100644
--- a/ext/opcache/tests/opt/sccp_032.phpt
+++ b/ext/opcache/tests/opt/sccp_032.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function test(): Generator {
diff --git a/ext/opcache/tests/opt/sccp_033.phpt b/ext/opcache/tests/opt/sccp_033.phpt
index f3fbbb9c289..2ce159dde5a 100644
--- a/ext/opcache/tests/opt/sccp_033.phpt
+++ b/ext/opcache/tests/opt/sccp_033.phpt
@@ -4,8 +4,8 @@ SCCP: Warning during evaluation of function
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/opt/skipif.inc b/ext/opcache/tests/opt/skipif.inc
deleted file mode 100644
index c5a81810391..00000000000
--- a/ext/opcache/tests/opt/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  if (!extension_loaded('Zend OPcache')) die('skip Zend OPcache extension not available');
-?>
diff --git a/ext/opcache/tests/opt/verify_return_type.phpt b/ext/opcache/tests/opt/verify_return_type.phpt
index 7f52c829a46..a462752a618 100644
--- a/ext/opcache/tests/opt/verify_return_type.phpt
+++ b/ext/opcache/tests/opt/verify_return_type.phpt
@@ -6,8 +6,8 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.opt_debug_level=0x20000
 opcache.preload=
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/optimize_func_calls.phpt b/ext/opcache/tests/optimize_func_calls.phpt
index ac30405ac37..00c319be2ef 100644
--- a/ext/opcache/tests/optimize_func_calls.phpt
+++ b/ext/opcache/tests/optimize_func_calls.phpt
@@ -4,8 +4,8 @@ Test with optimization of function calls
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/optimize_func_calls_001.phpt b/ext/opcache/tests/optimize_func_calls_001.phpt
index 21926d0e054..3d9887ffd32 100644
--- a/ext/opcache/tests/optimize_func_calls_001.phpt
+++ b/ext/opcache/tests/optimize_func_calls_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Don't create FETCH_DIM_R with UNUSED op2
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/optimize_static_001.phpt b/ext/opcache/tests/optimize_static_001.phpt
index 200c9fe9205..a71f029b330 100644
--- a/ext/opcache/tests/optimize_static_001.phpt
+++ b/ext/opcache/tests/optimize_static_001.phpt
@@ -4,8 +4,8 @@ Keep BIND_STATIC when initial value refer to unresolved constants
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo() {
diff --git a/ext/opcache/tests/phi_remove_001.phpt b/ext/opcache/tests/phi_remove_001.phpt
index d8c1a64eec8..58018d33f45 100644
--- a/ext/opcache/tests/phi_remove_001.phpt
+++ b/ext/opcache/tests/phi_remove_001.phpt
@@ -4,8 +4,8 @@ Phi sources remove 001
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function getOnlyMPEGaudioInfoBruteForce($info) {
diff --git a/ext/opcache/tests/phi_remove_002.phpt b/ext/opcache/tests/phi_remove_002.phpt
index 7e8b64bdf31..736e99f465e 100644
--- a/ext/opcache/tests/phi_remove_002.phpt
+++ b/ext/opcache/tests/phi_remove_002.phpt
@@ -4,8 +4,8 @@ Phi sources remove 002
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function func($blogname, $user = '' ) {
diff --git a/ext/opcache/tests/phi_use_chain.phpt b/ext/opcache/tests/phi_use_chain.phpt
index 173d874d214..4a40e61d39b 100644
--- a/ext/opcache/tests/phi_use_chain.phpt
+++ b/ext/opcache/tests/phi_use_chain.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Check that phi use chains are correctly maintained when removing blocks
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/preload_001.phpt b/ext/opcache/tests/preload_001.phpt
index 25f0d01230b..2a94b2ca754 100644
--- a/ext/opcache/tests/preload_001.phpt
+++ b/ext/opcache/tests/preload_001.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_002.phpt b/ext/opcache/tests/preload_002.phpt
index 0115ff05649..b09955379a4 100644
--- a/ext/opcache/tests/preload_002.phpt
+++ b/ext/opcache/tests/preload_002.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_003.phpt b/ext/opcache/tests/preload_003.phpt
index 9ecec31aaed..a2b28701180 100644
--- a/ext/opcache/tests/preload_003.phpt
+++ b/ext/opcache/tests/preload_003.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_004.phpt b/ext/opcache/tests/preload_004.phpt
index c8006dae1c1..76047bde622 100644
--- a/ext/opcache/tests/preload_004.phpt
+++ b/ext/opcache/tests/preload_004.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_undef_const.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_005.phpt b/ext/opcache/tests/preload_005.phpt
index 67e44610bc6..563256ede22 100644
--- a/ext/opcache/tests/preload_005.phpt
+++ b/ext/opcache/tests/preload_005.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_globals.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_006.phpt b/ext/opcache/tests/preload_006.phpt
index 76d96297746..92f68ff0d95 100644
--- a/ext/opcache/tests/preload_006.phpt
+++ b/ext/opcache/tests/preload_006.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_inheritance_error_ind.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 if (getenv('SKIP_ASAN')) die('xfail Startup failure leak');
 ?>
diff --git a/ext/opcache/tests/preload_007.phpt b/ext/opcache/tests/preload_007.phpt
index 7a8e011acc5..71cdfe444f4 100644
--- a/ext/opcache/tests/preload_007.phpt
+++ b/ext/opcache/tests/preload_007.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_include.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_008.phpt b/ext/opcache/tests/preload_008.phpt
index 8d7b42cab5b..c6ae2ce1d3b 100644
--- a/ext/opcache/tests/preload_008.phpt
+++ b/ext/opcache/tests/preload_008.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_009.phpt b/ext/opcache/tests/preload_009.phpt
index 88d0df5fddc..bb15998f7ab 100644
--- a/ext/opcache/tests/preload_009.phpt
+++ b/ext/opcache/tests/preload_009.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_undef_const_2.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_010.phpt b/ext/opcache/tests/preload_010.phpt
index 4e5121f23c7..6e431d1ca8d 100644
--- a/ext/opcache/tests/preload_010.phpt
+++ b/ext/opcache/tests/preload_010.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_overwritten_prop_init.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_011.phpt b/ext/opcache/tests/preload_011.phpt
index 9beab030829..016823aac87 100644
--- a/ext/opcache/tests/preload_011.phpt
+++ b/ext/opcache/tests/preload_011.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_variance_ind.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_012.phpt b/ext/opcache/tests/preload_012.phpt
index 0ca2ae15b9b..836d4707a0d 100644
--- a/ext/opcache/tests/preload_012.phpt
+++ b/ext/opcache/tests/preload_012.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_const_autoload.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_013.phpt b/ext/opcache/tests/preload_013.phpt
index 925a1fc5ef9..7485d4ffa25 100644
--- a/ext/opcache/tests/preload_013.phpt
+++ b/ext/opcache/tests/preload_013.phpt
@@ -6,9 +6,10 @@ opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_nested_function.inc
 opcache.interned_strings_buffer=0
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_bug79114.phpt b/ext/opcache/tests/preload_bug79114.phpt
index e5251da18dc..b845e0141e2 100644
--- a/ext/opcache/tests/preload_bug79114.phpt
+++ b/ext/opcache/tests/preload_bug79114.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_class_alias.phpt b/ext/opcache/tests/preload_class_alias.phpt
index 3c615c409ac..72c88fe7a3e 100644
--- a/ext/opcache/tests/preload_class_alias.phpt
+++ b/ext/opcache/tests/preload_class_alias.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_class_alias.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_class_alias_2.phpt b/ext/opcache/tests/preload_class_alias_2.phpt
index 82167afa9b3..b697110083e 100644
--- a/ext/opcache/tests/preload_class_alias_2.phpt
+++ b/ext/opcache/tests/preload_class_alias_2.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_class_alias_2.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_dynamic_function.phpt b/ext/opcache/tests/preload_dynamic_function.phpt
index 451a58eb343..68c552aec8a 100644
--- a/ext/opcache/tests/preload_dynamic_function.phpt
+++ b/ext/opcache/tests/preload_dynamic_function.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_dynamic_function.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_early_binding.phpt b/ext/opcache/tests/preload_early_binding.phpt
index 0db5ab14188..557d71d0966 100644
--- a/ext/opcache/tests/preload_early_binding.phpt
+++ b/ext/opcache/tests/preload_early_binding.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_early_binding.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_ind.phpt b/ext/opcache/tests/preload_ind.phpt
index 4f0c625b08d..f1b6b26ead2 100644
--- a/ext/opcache/tests/preload_ind.phpt
+++ b/ext/opcache/tests/preload_ind.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_ind.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_loadable_classes_1.phpt b/ext/opcache/tests/preload_loadable_classes_1.phpt
index c89633343cd..18087b7bbb8 100644
--- a/ext/opcache/tests/preload_loadable_classes_1.phpt
+++ b/ext/opcache/tests/preload_loadable_classes_1.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_loadable_classes_1.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_loadable_classes_2.phpt b/ext/opcache/tests/preload_loadable_classes_2.phpt
index 8d4e8e3712c..c16e2ca3ac7 100644
--- a/ext/opcache/tests/preload_loadable_classes_2.phpt
+++ b/ext/opcache/tests/preload_loadable_classes_2.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_loadable_classes_2.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_loadable_classes_3.phpt b/ext/opcache/tests/preload_loadable_classes_3.phpt
index b12cc9d3cd4..f9928c8e54c 100644
--- a/ext/opcache/tests/preload_loadable_classes_3.phpt
+++ b/ext/opcache/tests/preload_loadable_classes_3.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_loadable_classes_3.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_method_static_vars.phpt b/ext/opcache/tests/preload_method_static_vars.phpt
index 05716c91e52..7edddba1b4e 100644
--- a/ext/opcache/tests/preload_method_static_vars.phpt
+++ b/ext/opcache/tests/preload_method_static_vars.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_method_static_vars.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_parse_error.phpt b/ext/opcache/tests/preload_parse_error.phpt
index da9879ad357..c59aacbcce5 100644
--- a/ext/opcache/tests/preload_parse_error.phpt
+++ b/ext/opcache/tests/preload_parse_error.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_parse_error.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 if (getenv('SKIP_ASAN')) die('xfail Startup failure leak');
 ?>
diff --git a/ext/opcache/tests/preload_prop_info_table.phpt b/ext/opcache/tests/preload_prop_info_table.phpt
index 51c798409cb..4c93496bf16 100644
--- a/ext/opcache/tests/preload_prop_info_table.phpt
+++ b/ext/opcache/tests/preload_prop_info_table.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_static_var_inheritance.phpt b/ext/opcache/tests/preload_static_var_inheritance.phpt
index dd5e4308a9e..bb013a9983b 100644
--- a/ext/opcache/tests/preload_static_var_inheritance.phpt
+++ b/ext/opcache/tests/preload_static_var_inheritance.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_static_var_inheritance.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_trait_alias.phpt b/ext/opcache/tests/preload_trait_alias.phpt
index 89b843cd76e..a931d838a24 100644
--- a/ext/opcache/tests/preload_trait_alias.phpt
+++ b/ext/opcache/tests/preload_trait_alias.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_trait_multiple_fixup.phpt b/ext/opcache/tests/preload_trait_multiple_fixup.phpt
index dbee2595c21..5f12de5bcbd 100644
--- a/ext/opcache/tests/preload_trait_multiple_fixup.phpt
+++ b/ext/opcache/tests/preload_trait_multiple_fixup.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_trait_multiple_fixup.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_trait_static.phpt b/ext/opcache/tests/preload_trait_static.phpt
index c767ad6a9b3..cbf09c57a07 100644
--- a/ext/opcache/tests/preload_trait_static.phpt
+++ b/ext/opcache/tests/preload_trait_static.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_trait_static.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_unresolved_prop_type.phpt b/ext/opcache/tests/preload_unresolved_prop_type.phpt
index 9e0b3570ee4..0ec301b5c88 100644
--- a/ext/opcache/tests/preload_unresolved_prop_type.phpt
+++ b/ext/opcache/tests/preload_unresolved_prop_type.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_unresolved_prop_type.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_windows.phpt b/ext/opcache/tests/preload_windows.phpt
index 0414cfa0b53..24e043d7320 100644
--- a/ext/opcache/tests/preload_windows.phpt
+++ b/ext/opcache/tests/preload_windows.phpt
@@ -5,9 +5,10 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload.inc
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (PHP_OS_FAMILY != 'Windows') die('skip Windows only test');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/revalidate_path_01.phpt b/ext/opcache/tests/revalidate_path_01.phpt
index 317e872a4c5..ff87e73b554 100644
--- a/ext/opcache/tests/revalidate_path_01.phpt
+++ b/ext/opcache/tests/revalidate_path_01.phpt
@@ -4,8 +4,8 @@ revalidate_path 01: OPCache must cache only resolved real paths when revalidate_
 opcache.enable=1
 opcache.enable_cli=1
 opcache.revalidate_path=1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --CONFLICTS--
 server
 --FILE--
diff --git a/ext/opcache/tests/send_unpack_empty_array.phpt b/ext/opcache/tests/send_unpack_empty_array.phpt
index f2325626f1b..86b333dfa47 100644
--- a/ext/opcache/tests/send_unpack_empty_array.phpt
+++ b/ext/opcache/tests/send_unpack_empty_array.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Type inference of SEND_UNPACK with empty array
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function test() {
diff --git a/ext/opcache/tests/skipif.inc b/ext/opcache/tests/skipif.inc
deleted file mode 100644
index c5a81810391..00000000000
--- a/ext/opcache/tests/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  if (!extension_loaded('Zend OPcache')) die('skip Zend OPcache extension not available');
-?>
diff --git a/ext/opcache/tests/ssa_bug_001.phpt b/ext/opcache/tests/ssa_bug_001.phpt
index 06be60892c6..6da9052c630 100644
--- a/ext/opcache/tests/ssa_bug_001.phpt
+++ b/ext/opcache/tests/ssa_bug_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SSA construction for CFG with unreachable basic blocks
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class X {
diff --git a/ext/opcache/tests/ssa_bug_002.phpt b/ext/opcache/tests/ssa_bug_002.phpt
index 10b03a84caf..71816774032 100644
--- a/ext/opcache/tests/ssa_bug_002.phpt
+++ b/ext/opcache/tests/ssa_bug_002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Incorrect NOP removal on jump to NOP
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/ssa_bug_003.phpt b/ext/opcache/tests/ssa_bug_003.phpt
index bcfdded45ed..780a0295578 100644
--- a/ext/opcache/tests/ssa_bug_003.phpt
+++ b/ext/opcache/tests/ssa_bug_003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Incorrect elision of return type checks
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/ssa_bug_004.phpt b/ext/opcache/tests/ssa_bug_004.phpt
index b26479d66a6..c48e17b9779 100644
--- a/ext/opcache/tests/ssa_bug_004.phpt
+++ b/ext/opcache/tests/ssa_bug_004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Assign elision exception safety: ICALL
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/ssa_bug_005.phpt b/ext/opcache/tests/ssa_bug_005.phpt
index 5c5965c1a17..27fc6f8833e 100644
--- a/ext/opcache/tests/ssa_bug_005.phpt
+++ b/ext/opcache/tests/ssa_bug_005.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Assign elision exception safety: UCALL
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/ssa_bug_006.phpt b/ext/opcache/tests/ssa_bug_006.phpt
index 39e68230c58..6150c03fe0a 100644
--- a/ext/opcache/tests/ssa_bug_006.phpt
+++ b/ext/opcache/tests/ssa_bug_006.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Incorrect optimization of $i = $i++
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/ssa_bug_007.phpt b/ext/opcache/tests/ssa_bug_007.phpt
index 344a05665d0..59f98d901bc 100644
--- a/ext/opcache/tests/ssa_bug_007.phpt
+++ b/ext/opcache/tests/ssa_bug_007.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Incorrect CFG/SSA construction for SWITCH with few identical successors
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function render($properties) {
diff --git a/ext/opcache/tests/ssa_bug_008.phpt b/ext/opcache/tests/ssa_bug_008.phpt
index 32c264304b4..8434da38109 100644
--- a/ext/opcache/tests/ssa_bug_008.phpt
+++ b/ext/opcache/tests/ssa_bug_008.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Incorrect CFG/SSA reconstruction
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 if (!is_int($info = gc_collect_cycles()) || ($info < 100)) {
diff --git a/ext/opcache/tests/ssa_bug_009.phpt b/ext/opcache/tests/ssa_bug_009.phpt
index 482c6f85fc1..17f7e4c2f91 100644
--- a/ext/opcache/tests/ssa_bug_009.phpt
+++ b/ext/opcache/tests/ssa_bug_009.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Incorrect type inference
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class PHP_CodeCoverage
diff --git a/ext/opcache/tests/ssa_bug_010.phpt b/ext/opcache/tests/ssa_bug_010.phpt
index 99a15941219..1ce7221311f 100644
--- a/ext/opcache/tests/ssa_bug_010.phpt
+++ b/ext/opcache/tests/ssa_bug_010.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Wrong assertion
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo($parts, $a, $b) {
diff --git a/ext/opcache/tests/ssa_bug_011.phpt b/ext/opcache/tests/ssa_bug_011.phpt
index 253bdc78d5b..9cc861f3438 100644
--- a/ext/opcache/tests/ssa_bug_011.phpt
+++ b/ext/opcache/tests/ssa_bug_011.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Wrong assertion
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function foo($transitions) {
diff --git a/ext/opcache/tests/switch_with_coinciding_targets.phpt b/ext/opcache/tests/switch_with_coinciding_targets.phpt
index 729af9617f5..fdcb6d7eded 100644
--- a/ext/opcache/tests/switch_with_coinciding_targets.phpt
+++ b/ext/opcache/tests/switch_with_coinciding_targets.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Switch where all targets, including default, coincide
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/verify_return_dfg.phpt b/ext/opcache/tests/verify_return_dfg.phpt
index 53f9e74f537..d1b78ca4c48 100644
--- a/ext/opcache/tests/verify_return_dfg.phpt
+++ b/ext/opcache/tests/verify_return_dfg.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Incorrect liveness computation for verify-return
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function test($foo): string
diff --git a/ext/opcache/tests/verify_return_instanceof.phpt b/ext/opcache/tests/verify_return_instanceof.phpt
index 14323d533bd..360f48a13b4 100644
--- a/ext/opcache/tests/verify_return_instanceof.phpt
+++ b/ext/opcache/tests/verify_return_instanceof.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Instanceof checks in VERIFY_RETURN_TYPE optimization may deal with unlinked classes
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 interface foo { }
diff --git a/ext/opcache/tests/warning_replay.phpt b/ext/opcache/tests/warning_replay.phpt
index e8903bbcf97..2dce9382af9 100644
--- a/ext/opcache/tests/warning_replay.phpt
+++ b/ext/opcache/tests/warning_replay.phpt
@@ -2,6 +2,8 @@
 Opcache should replay compilation warnings if opcache.record_warnings=1
 --INI--
 opcache.record_warnings=1
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/wrong_inlining_001.phpt b/ext/opcache/tests/wrong_inlining_001.phpt
index f8cebc152e2..0775583d149 100644
--- a/ext/opcache/tests/wrong_inlining_001.phpt
+++ b/ext/opcache/tests/wrong_inlining_001.phpt
@@ -4,8 +4,8 @@ Pass result of inlined function by reference
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function get_const() {
diff --git a/ext/opcache/tests/wrong_inlining_002.phpt b/ext/opcache/tests/wrong_inlining_002.phpt
index 9aaa60c5342..15a7ea56077 100644
--- a/ext/opcache/tests/wrong_inlining_002.phpt
+++ b/ext/opcache/tests/wrong_inlining_002.phpt
@@ -4,8 +4,8 @@ $this not in object context
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 class Foo {
diff --git a/ext/opcache/tests/wrong_inlining_003.phpt b/ext/opcache/tests/wrong_inlining_003.phpt
index 12082e70e42..744caa257d0 100644
--- a/ext/opcache/tests/wrong_inlining_003.phpt
+++ b/ext/opcache/tests/wrong_inlining_003.phpt
@@ -4,8 +4,8 @@ foo($bar) with undefined $bar
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function get_const() {
diff --git a/ext/opcache/tests/wrong_inlining_004.phpt b/ext/opcache/tests/wrong_inlining_004.phpt
index 26f8f4b2bf3..b9818ab57af 100644
--- a/ext/opcache/tests/wrong_inlining_004.phpt
+++ b/ext/opcache/tests/wrong_inlining_004.phpt
@@ -4,8 +4,8 @@ Inlining through call_user_func()
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 function get_const() {
diff --git a/ext/opcache/tests/wrong_inlining_005.phpt b/ext/opcache/tests/wrong_inlining_005.phpt
index 0526a7b035f..13094445f01 100644
--- a/ext/opcache/tests/wrong_inlining_005.phpt
+++ b/ext/opcache/tests/wrong_inlining_005.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Inlining of functions with ref arguments
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+opcache
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/zzz_basic_logging.phpt b/ext/opcache/tests/zzz_basic_logging.phpt
index 0fbf308a51a..d8c4afa4d8d 100644
--- a/ext/opcache/tests/zzz_basic_logging.phpt
+++ b/ext/opcache/tests/zzz_basic_logging.phpt
@@ -11,9 +11,10 @@ opcache.error_log=
 opcache.log_verbosity_level=4
 opcache.huge_code_pages=0
 opcache.preload=
+--EXTENSIONS--
+opcache
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 // Prints "Debug Restarting!" message on next request.
 if (getenv('SKIP_REPEAT')) die("skip Not repeatable");
 ?>
diff --git a/ext/shmop/tests/001.phpt b/ext/shmop/tests/001.phpt
index a0f85922eef..3878a2e9958 100644
--- a/ext/shmop/tests/001.phpt
+++ b/ext/shmop/tests/001.phpt
@@ -1,11 +1,7 @@
 --TEST--
 shmop extension test
---SKIPIF--
-<?php
-    if (!extension_loaded("shmop")) {
-        die("skip shmop() extension not available");
-    }
-?>
+--EXTENSIONS--
+shmop
 --FILE--
 <?php
     $hex_shm_id = 0xff3;
diff --git a/ext/shmop/tests/002.phpt b/ext/shmop/tests/002.phpt
index 41f2ce57831..56aea8fcdcb 100644
--- a/ext/shmop/tests/002.phpt
+++ b/ext/shmop/tests/002.phpt
@@ -2,12 +2,8 @@
 shmop extension error messages
 --CREDITS--
 edgarsandi - <edgar.r.sandi@gmail.com>
---SKIPIF--
-<?php
-    if (!extension_loaded("shmop")) {
-        die("skip shmop() extension not available");
-    }
-?>
+--EXTENSIONS--
+shmop
 --FILE--
 <?php
 
diff --git a/ext/shmop/tests/shmop_open_private.phpt b/ext/shmop/tests/shmop_open_private.phpt
index f7e3a4666aa..8757de0a633 100644
--- a/ext/shmop/tests/shmop_open_private.phpt
+++ b/ext/shmop/tests/shmop_open_private.phpt
@@ -1,9 +1,7 @@
 --TEST--
 shmop_open with IPC_PRIVATE creates private SHM
---SKIPIF--
-<?php
-if (!extension_loaded('shmop')) die('skip shmop extension not available');
-?>
+--EXTENSIONS--
+shmop
 --FILE--
 <?php
 $write = 'test';