From 344f7f5d47363e3fe0af2e5d87098d7b6a013f18 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Sun, 16 May 2021 19:45:13 +0200
Subject: [PATCH 1/2] Migrate skip checks to --EXTENSIONS-- for ext/gd

Cf. PR #6787.
---
 ext/gd/tests/001-mb.phpt                                  | 2 ++
 ext/gd/tests/001.phpt                                     | 2 ++
 ext/gd/tests/bug19366.phpt                                | 6 ++----
 ext/gd/tests/bug22544-mb.phpt                             | 8 ++------
 ext/gd/tests/bug22544.phpt                                | 8 ++------
 ext/gd/tests/bug24155.phpt                                | 5 ++---
 ext/gd/tests/bug24594.phpt                                | 8 ++------
 ext/gd/tests/bug27582_1.phpt                              | 6 ++----
 ext/gd/tests/bug28147.phpt                                | 6 ++----
 ext/gd/tests/bug36697-mb.phpt                             | 8 ++------
 ext/gd/tests/bug36697.phpt                                | 8 ++------
 ext/gd/tests/bug37346-mb.phpt                             | 6 ++----
 ext/gd/tests/bug37346.phpt                                | 6 ++----
 ext/gd/tests/bug37360.phpt                                | 6 ++----
 ext/gd/tests/bug38112.phpt                                | 8 ++------
 ext/gd/tests/bug38179.phpt                                | 6 ++----
 ext/gd/tests/bug38212-mb.phpt                             | 6 ++----
 ext/gd/tests/bug38212.phpt                                | 6 ++----
 ext/gd/tests/bug39082.phpt                                | 8 ++------
 ext/gd/tests/bug39273.phpt                                | 6 ++----
 ext/gd/tests/bug39366.phpt                                | 3 ++-
 ext/gd/tests/bug39508.phpt                                | 6 ++----
 ext/gd/tests/bug39780.phpt                                | 3 ++-
 ext/gd/tests/bug39780_extern.phpt                         | 3 ++-
 ext/gd/tests/bug40764.phpt                                | 6 ++----
 ext/gd/tests/bug41442.phpt                                | 5 ++---
 ext/gd/tests/bug42434.phpt                                | 8 ++------
 ext/gd/tests/bug43073.phpt                                | 3 ++-
 ext/gd/tests/bug43121.phpt                                | 3 ++-
 ext/gd/tests/bug43475.phpt                                | 3 ++-
 ext/gd/tests/bug43828.phpt                                | 3 ++-
 ext/gd/tests/bug44849.phpt                                | 6 ++----
 ext/gd/tests/bug45799.phpt                                | 6 ++----
 ext/gd/tests/bug47946.phpt                                | 3 ++-
 ext/gd/tests/bug48555.phpt                                | 3 ++-
 ext/gd/tests/bug48732-mb.phpt                             | 3 ++-
 ext/gd/tests/bug48732.phpt                                | 3 ++-
 ext/gd/tests/bug48801-mb.phpt                             | 3 ++-
 ext/gd/tests/bug48801.phpt                                | 3 ++-
 ext/gd/tests/bug49600.phpt                                | 3 ++-
 ext/gd/tests/bug50194.phpt                                | 3 ++-
 ext/gd/tests/bug51263.phpt                                | 3 ++-
 ext/gd/tests/bug51671.phpt                                | 6 ++----
 ext/gd/tests/bug52070.phpt                                | 6 ++----
 ext/gd/tests/bug53154.phpt                                | 3 ++-
 ext/gd/tests/bug53156.phpt                                | 3 ++-
 ext/gd/tests/bug53504.phpt                                | 3 ++-
 ext/gd/tests/bug53640.phpt                                | 3 ++-
 ext/gd/tests/bug55005.phpt                                | 6 ++----
 ext/gd/tests/bug60160.phpt                                | 6 ++----
 ext/gd/tests/bug61221.phpt                                | 6 ++----
 ext/gd/tests/bug64641.phpt                                | 3 ++-
 ext/gd/tests/bug65148.phpt                                | 6 ++----
 ext/gd/tests/bug66005.phpt                                | 6 ++----
 ext/gd/tests/bug66339-mb.phpt                             | 6 ++----
 ext/gd/tests/bug66339.phpt                                | 6 ++----
 ext/gd/tests/bug66356.phpt                                | 6 ++----
 ext/gd/tests/bug66387.phpt                                | 3 ++-
 ext/gd/tests/bug66590.phpt                                | 3 ++-
 ext/gd/tests/bug66590_1.phpt                              | 3 ++-
 ext/gd/tests/bug66882.phpt                                | 6 ++----
 ext/gd/tests/bug67248.phpt                                | 3 ++-
 ext/gd/tests/bug67325.phpt                                | 3 ++-
 ext/gd/tests/bug67447.phpt                                | 8 ++------
 ext/gd/tests/bug69024.phpt                                | 6 ++----
 ext/gd/tests/bug70047.phpt                                | 6 ++----
 ext/gd/tests/bug70102.phpt                                | 3 ++-
 ext/gd/tests/bug70976.phpt                                | 6 ++----
 ext/gd/tests/bug71912-mb.phpt                             | 3 ++-
 ext/gd/tests/bug71912.phpt                                | 3 ++-
 ext/gd/tests/bug71952.phpt                                | 6 ++----
 ext/gd/tests/bug72227.phpt                                | 6 ++----
 ext/gd/tests/bug72298.phpt                                | 6 ++----
 ext/gd/tests/bug72337.phpt                                | 6 ++----
 ext/gd/tests/bug72339.phpt                                | 2 ++
 ext/gd/tests/bug72482.phpt                                | 6 ++----
 ext/gd/tests/bug72482_2.phpt                              | 6 ++----
 ext/gd/tests/bug72494.phpt                                | 6 ++----
 ext/gd/tests/bug72512.phpt                                | 3 ++-
 ext/gd/tests/bug72512_0.phpt                              | 3 ++-
 ext/gd/tests/bug72512_1.phpt                              | 3 ++-
 ext/gd/tests/bug72596.phpt                                | 6 ++----
 ext/gd/tests/bug72604.phpt                                | 6 ++----
 ext/gd/tests/bug72696.phpt                                | 6 ++----
 ext/gd/tests/bug72697.phpt                                | 3 ++-
 ext/gd/tests/bug72709.phpt                                | 6 ++----
 ext/gd/tests/bug72730.phpt                                | 6 ++----
 ext/gd/tests/bug72913.phpt                                | 6 ++----
 ext/gd/tests/bug73155.phpt                                | 6 ++----
 ext/gd/tests/bug73157.phpt                                | 6 ++----
 ext/gd/tests/bug73159.phpt                                | 6 ++----
 ext/gd/tests/bug73161.phpt                                | 6 ++----
 ext/gd/tests/bug73213.phpt                                | 6 ++----
 ext/gd/tests/bug73272.phpt                                | 6 ++----
 ext/gd/tests/bug73279.phpt                                | 3 ++-
 ext/gd/tests/bug73279_old.phpt                            | 3 ++-
 ext/gd/tests/bug73281.phpt                                | 3 ++-
 ext/gd/tests/bug73291.phpt                                | 6 ++----
 ext/gd/tests/bug73549.phpt                                | 6 ++----
 ext/gd/tests/bug73614.phpt                                | 3 ++-
 ext/gd/tests/bug73868.phpt                                | 6 ++----
 ext/gd/tests/bug73869.phpt                                | 6 ++----
 ext/gd/tests/bug73957.phpt                                | 3 ++-
 ext/gd/tests/bug73968.phpt                                | 6 ++----
 ext/gd/tests/bug74031.phpt                                | 6 ++----
 ext/gd/tests/bug74435.phpt                                | 6 ++----
 ext/gd/tests/bug75111.phpt                                | 6 ++----
 ext/gd/tests/bug75124.phpt                                | 3 ++-
 ext/gd/tests/bug75571.phpt                                | 6 ++----
 ext/gd/tests/bug76041.phpt                                | 6 ++----
 ext/gd/tests/bug77195.phpt                                | 3 ++-
 ext/gd/tests/bug77198_auto.phpt                           | 3 ++-
 ext/gd/tests/bug77198_threshold.phpt                      | 3 ++-
 ext/gd/tests/bug77200.phpt                                | 3 ++-
 ext/gd/tests/bug77269.phpt                                | 3 ++-
 ext/gd/tests/bug77270.phpt                                | 3 ++-
 ext/gd/tests/bug77272.phpt                                | 3 ++-
 ext/gd/tests/bug77391.phpt                                | 3 ++-
 ext/gd/tests/bug77479.phpt                                | 3 ++-
 ext/gd/tests/bug77700.phpt                                | 6 ++----
 ext/gd/tests/bug77943.phpt                                | 6 ++----
 ext/gd/tests/bug77973.phpt                                | 3 ++-
 ext/gd/tests/bug79067.phpt                                | 6 ++----
 ext/gd/tests/bug79068.phpt                                | 6 ++----
 ext/gd/tests/bug79615.phpt                                | 6 ++----
 ext/gd/tests/bug79676.phpt                                | 6 ++----
 ext/gd/tests/colorat.phpt                                 | 6 ++----
 ext/gd/tests/colorclosest.phpt                            | 6 ++----
 ext/gd/tests/colorexact.phpt                              | 6 ++----
 ext/gd/tests/colormatch.phpt                              | 6 ++----
 ext/gd/tests/colorresolve.phpt                            | 6 ++----
 ext/gd/tests/copy.phpt                                    | 6 ++----
 ext/gd/tests/copypalette.phpt                             | 6 ++----
 ext/gd/tests/copyresized.phpt                             | 6 ++----
 ext/gd/tests/crafted_gd2.phpt                             | 8 ++------
 ext/gd/tests/createfromgd2.phpt                           | 2 ++
 ext/gd/tests/createfromstring.phpt                        | 3 ++-
 ext/gd/tests/createfromwbmp-mb.phpt                       | 6 ++----
 ext/gd/tests/createfromwbmp.phpt                          | 6 ++----
 ext/gd/tests/createfromwbmp2.phpt                         | 3 ++-
 ext/gd/tests/createfromwbmp2_extern.phpt                  | 3 ++-
 ext/gd/tests/dashedlines.phpt                             | 6 ++----
 ext/gd/tests/gd_info_basic.phpt                           | 8 ++------
 ext/gd/tests/gd_info_variation1.phpt                      | 5 ++---
 ext/gd/tests/gdimage_prevent_cloning.phpt                 | 8 ++------
 ext/gd/tests/gdimage_prevent_serialization.phpt           | 8 ++------
 ext/gd/tests/gif.phpt                                     | 5 ++---
 ext/gd/tests/gif2gd.phpt                                  | 6 ++----
 ext/gd/tests/gif2jpg.phpt                                 | 6 ++----
 ext/gd/tests/gif2png.phpt                                 | 6 ++----
 ext/gd/tests/github_bug_215.phpt                          | 3 ++-
 ext/gd/tests/imageantialias_error2.phpt                   | 6 ++----
 ext/gd/tests/imagearc_basic.phpt                          | 6 ++----
 ext/gd/tests/imagearc_variation1.phpt                     | 6 ++----
 ext/gd/tests/imagearc_variation2.phpt                     | 6 ++----
 ext/gd/tests/imagebmp_basic.phpt                          | 3 ++-
 ext/gd/tests/imagebmp_nullbyte_injection.phpt             | 3 ++-
 ext/gd/tests/imagechar_basic.phpt                         | 6 ++----
 ext/gd/tests/imagecharup_basic.phpt                       | 6 ++----
 ext/gd/tests/imagecolorallocate_basic.phpt                | 5 ++---
 ext/gd/tests/imagecolorallocate_variation5.phpt           | 5 ++---
 ext/gd/tests/imagecolorallocate_variation6.phpt           | 5 ++---
 ext/gd/tests/imagecolorallocatealpha_basic.phpt           | 3 ++-
 ext/gd/tests/imagecolorclosesthwb_basic_001.phpt          | 8 ++------
 ext/gd/tests/imagecolordeallocate_basic.phpt              | 6 ++----
 ext/gd/tests/imagecolordeallocate_error3.phpt             | 6 ++----
 ext/gd/tests/imagecolordeallocate_error4.phpt             | 6 ++----
 ext/gd/tests/imagecolormatch_basic.phpt                   | 6 ++----
 ext/gd/tests/imagecolormatch_error2.phpt                  | 6 ++----
 ext/gd/tests/imagecolormatch_error3.phpt                  | 6 ++----
 ext/gd/tests/imagecolormatch_error4.phpt                  | 6 ++----
 ext/gd/tests/imagecolorset_basic.phpt                     | 8 ++------
 ext/gd/tests/imagecolorstotal_basic.phpt                  | 6 ++----
 ext/gd/tests/imagecolourstotal_basic.phpt                 | 5 ++---
 ext/gd/tests/imageconvolution_basic.phpt                  | 6 ++----
 ext/gd/tests/imageconvolution_error2.phpt                 | 6 ++----
 ext/gd/tests/imageconvolution_error3.phpt                 | 6 ++----
 ext/gd/tests/imagecopymerge_basic.phpt                    | 6 ++----
 ext/gd/tests/imagecopymergegray_basic.phpt                | 6 ++----
 ext/gd/tests/imagecopyresampled_basic.phpt                | 6 ++----
 ext/gd/tests/imagecopyresampled_variation1.phpt           | 6 ++----
 ext/gd/tests/imagecreate_error.phpt                       | 3 ++-
 ext/gd/tests/imagecreatefrombmp_basic.phpt                | 3 ++-
 ext/gd/tests/imagecreatefromstring_bmp.phpt               | 3 ++-
 ext/gd/tests/imagecreatefromstring_gif.phpt               | 3 ++-
 ext/gd/tests/imagecreatefromstring_png.phpt               | 3 ++-
 ext/gd/tests/imagecreatefromstring_webp.phpt              | 3 ++-
 ext/gd/tests/imagecreatefromtga_basic.phpt                | 3 ++-
 ext/gd/tests/imagecreatefromtga_variation.phpt            | 3 ++-
 ext/gd/tests/imagecreatetruecolor_basic.phpt              | 3 ++-
 ext/gd/tests/imagecreatetruecolor_error2.phpt             | 3 ++-
 ext/gd/tests/imagecrop_auto.phpt                          | 4 +++-
 ext/gd/tests/imagedashedline_basic.phpt                   | 2 ++
 ext/gd/tests/imageellipse_basic.phpt                      | 6 ++----
 ext/gd/tests/imagefill_1.phpt                             | 5 ++---
 ext/gd/tests/imagefilledarc_basic.phpt                    | 3 ++-
 ext/gd/tests/imagefilledarc_variation1.phpt               | 3 ++-
 ext/gd/tests/imagefilledarc_variation2.phpt               | 3 ++-
 ext/gd/tests/imagefilledellipse_basic.phpt                | 6 ++----
 ext/gd/tests/imagefilledpolygon_basic.phpt                | 2 ++
 ext/gd/tests/imagefilltoborder_basic.phpt                 | 6 ++----
 ext/gd/tests/imagefilter.phpt                             | 5 ++---
 ext/gd/tests/imagefilter_error1.phpt                      | 6 ++----
 ext/gd/tests/imagefilter_error13.phpt                     | 6 ++----
 ext/gd/tests/imageflip.phpt                               | 4 +++-
 ext/gd/tests/imagefontheight_basic.phpt                   | 6 ++----
 ext/gd/tests/imagefontwidth_basic.phpt                    | 6 ++----
 ext/gd/tests/imagefttext.phpt                             | 5 ++---
 ext/gd/tests/imagegammacorrect_basic.phpt                 | 3 ++-
 ext/gd/tests/imagegammacorrect_variation1.phpt            | 3 ++-
 ext/gd/tests/imagegammacorrect_variation2.phpt            | 6 ++----
 ext/gd/tests/imagegd2_nullbyte_injection.phpt             | 6 ++----
 ext/gd/tests/imagegd_nullbyte_injection.phpt              | 6 ++----
 ext/gd/tests/imagegd_truecolor.phpt                       | 6 ++----
 ext/gd/tests/imagegetclip_basic.phpt                      | 6 ++----
 ext/gd/tests/imagegif_nullbyte_injection.phpt             | 6 ++----
 ext/gd/tests/imageinterlace_basic.phpt                    | 6 ++----
 ext/gd/tests/imageinterlace_variation1.phpt               | 6 ++----
 ext/gd/tests/imageinterlace_variation2.phpt               | 6 ++----
 ext/gd/tests/imageinterpolation_basic.phpt                | 6 ++----
 ext/gd/tests/imageistruecolor_basic.phpt                  | 3 ++-
 ext/gd/tests/imagejpeg_nullbyte_injection.phpt            | 3 ++-
 ext/gd/tests/imagelayereffect_basic.phpt                  | 3 ++-
 .../imageloadfont_end_of_file_while_reading_header.phpt   | 6 ++----
 ext/gd/tests/imageloadfont_error2.phpt                    | 6 ++----
 ext/gd/tests/imageloadfont_invalid.phpt                   | 6 ++----
 ext/gd/tests/imageopenpolygon_basic.phpt                  | 6 ++----
 ext/gd/tests/imagepalettetotruecolor_basic.phpt           | 6 ++----
 ext/gd/tests/imagepng_nullbyte_injection.phpt             | 3 ++-
 ext/gd/tests/imagepolygon_aa.phpt                         | 6 ++----
 ext/gd/tests/imagepolygon_basic.phpt                      | 2 ++
 ext/gd/tests/imagerectangle_basic.phpt                    | 6 ++----
 ext/gd/tests/imageresolution_jpeg.phpt                    | 3 ++-
 ext/gd/tests/imageresolution_png.phpt                     | 6 ++----
 ext/gd/tests/imagerotate_overflow.phpt                    | 6 ++----
 ext/gd/tests/imagescale_preserve_ratio.phpt               | 6 ++----
 ext/gd/tests/imagesetbrush_basic.phpt                     | 8 ++------
 ext/gd/tests/imagesetclip_basic.phpt                      | 6 ++----
 ext/gd/tests/imagesetthickness_basic.phpt                 | 3 ++-
 ext/gd/tests/imagestring_basic.phpt                       | 6 ++----
 ext/gd/tests/imagestringup_basic.phpt                     | 6 ++----
 ext/gd/tests/imagetruecolortopalette_basic.phpt           | 3 ++-
 ext/gd/tests/imagetruecolortopalette_error3.phpt          | 3 ++-
 ext/gd/tests/imagetruecolortopalette_error4.phpt          | 3 ++-
 ext/gd/tests/imagettftext_charmap_order.phpt              | 3 ++-
 ext/gd/tests/imagetypes_bmp.phpt                          | 6 ++----
 ext/gd/tests/imagetypes_tga.phpt                          | 6 ++----
 ext/gd/tests/imagewbmp-mb.phpt                            | 6 ++----
 ext/gd/tests/imagewbmp.phpt                               | 6 ++----
 ext/gd/tests/imagewbmp_nullbyte_injection.phpt            | 3 ++-
 ext/gd/tests/imagewebp_nullbyte_injection.phpt            | 3 ++-
 ext/gd/tests/imagexbm_nullbyte_injection.phpt             | 6 ++----
 ext/gd/tests/jpeg2png.phpt                                | 6 ++----
 ext/gd/tests/jpg2gd-mb.phpt                               | 6 ++----
 ext/gd/tests/jpg2gd.phpt                                  | 6 ++----
 ext/gd/tests/libgd00086.phpt                              | 3 ++-
 ext/gd/tests/libgd00086_extern.phpt                       | 3 ++-
 ext/gd/tests/libgd00094-mb.phpt                           | 3 ++-
 ext/gd/tests/libgd00094.phpt                              | 3 ++-
 ext/gd/tests/libgd00100.phpt                              | 3 ++-
 ext/gd/tests/libgd00101.phpt                              | 3 ++-
 ext/gd/tests/libgd00106.phpt                              | 6 ++----
 ext/gd/tests/libgd00186.phpt                              | 6 ++----
 ext/gd/tests/libgd00191.phpt                              | 3 ++-
 ext/gd/tests/lines.phpt                                   | 6 ++----
 ext/gd/tests/png2gd.phpt                                  | 6 ++----
 ext/gd/tests/pngcomp.phpt                                 | 6 ++----
 ext/gd/tests/test_image_equals_file_palette.phpt          | 6 ++----
 ext/gd/tests/types.phpt                                   | 6 ++----
 ext/gd/tests/webp_basic.phpt                              | 3 ++-
 ext/gd/tests/xbm2png.phpt                                 | 5 ++---
 ext/gd/tests/xpm2gd.phpt                                  | 6 ++----
 ext/gd/tests/xpm2jpg.phpt                                 | 6 ++----
 ext/gd/tests/xpm2png.phpt                                 | 6 ++----
 274 files changed, 550 insertions(+), 809 deletions(-)

diff --git a/ext/gd/tests/001-mb.phpt b/ext/gd/tests/001-mb.phpt
index 38bf14a3cb808..3093a59783d65 100644
--- a/ext/gd/tests/001-mb.phpt
+++ b/ext/gd/tests/001-mb.phpt
@@ -1,5 +1,7 @@
 --TEST--
 imagecreatefrompng() and empty/missing file
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php if (!function_exists("imagecreatefrompng")) print "skip"; ?>
 --FILE--
diff --git a/ext/gd/tests/001.phpt b/ext/gd/tests/001.phpt
index d741e1f50618d..7c2fcf3652312 100644
--- a/ext/gd/tests/001.phpt
+++ b/ext/gd/tests/001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 imagecreatefrompng() and empty/missing file
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php if (!function_exists("imagecreatefrompng")) print "skip"; ?>
 --FILE--
diff --git a/ext/gd/tests/bug19366.phpt b/ext/gd/tests/bug19366.phpt
index c6c3ed08ce3ad..7fae0be5d7e0c 100644
--- a/ext/gd/tests/bug19366.phpt
+++ b/ext/gd/tests/bug19366.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #19366 (gdimagefill() function crashes (fixed in bundled libgd))
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 echo "Alive: create image\n";
diff --git a/ext/gd/tests/bug22544-mb.phpt b/ext/gd/tests/bug22544-mb.phpt
index 23499617b88f7..b67478e558c47 100644
--- a/ext/gd/tests/bug22544-mb.phpt
+++ b/ext/gd/tests/bug22544-mb.phpt
@@ -1,11 +1,7 @@
 --TEST--
 Bug #22544 (TrueColor transparency in PNG images).
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available\n");
-    }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
     $image = imageCreateTruecolor(640, 100);
diff --git a/ext/gd/tests/bug22544.phpt b/ext/gd/tests/bug22544.phpt
index 3aca54df97a3c..1fba04d93739c 100644
--- a/ext/gd/tests/bug22544.phpt
+++ b/ext/gd/tests/bug22544.phpt
@@ -1,11 +1,7 @@
 --TEST--
 Bug #22544 (TrueColor transparency in PNG images).
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available\n");
-    }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
     $image = imageCreateTruecolor(640, 100);
diff --git a/ext/gd/tests/bug24155.phpt b/ext/gd/tests/bug24155.phpt
index 59da4598491e0..42c5e3d7926f5 100644
--- a/ext/gd/tests/bug24155.phpt
+++ b/ext/gd/tests/bug24155.phpt
@@ -1,10 +1,9 @@
 --TEST--
 Bug #24155 (gdImageRotate270 rotation problem).
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available\n");
-    }
     if (!function_exists("imagerotate")) die("skip requires bundled GD library\n");
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug24594.phpt b/ext/gd/tests/bug24594.phpt
index 4c91c6fe14639..910a14b34b8c1 100644
--- a/ext/gd/tests/bug24594.phpt
+++ b/ext/gd/tests/bug24594.phpt
@@ -1,11 +1,7 @@
 --TEST--
 Bug #24594 (Filling an area using tiles).
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available\n");
-    }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
     $tile = imagecreate(36,36);
diff --git a/ext/gd/tests/bug27582_1.phpt b/ext/gd/tests/bug27582_1.phpt
index 5fe857783bead..2604c5fcaa9fd 100644
--- a/ext/gd/tests/bug27582_1.phpt
+++ b/ext/gd/tests/bug27582_1.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #27582 (ImageFillToBorder() on alphablending image looses alpha on fill color)
---SKIPIF--
-<?php
-        if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $dest = dirname(realpath(__FILE__)) . '/bug27582.png';
diff --git a/ext/gd/tests/bug28147.phpt b/ext/gd/tests/bug28147.phpt
index def3bfd23333c..90314b153225d 100644
--- a/ext/gd/tests/bug28147.phpt
+++ b/ext/gd/tests/bug28147.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #28147 (Crash with anti-aliased line)
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 //
diff --git a/ext/gd/tests/bug36697-mb.phpt b/ext/gd/tests/bug36697-mb.phpt
index 8e7097eaa017f..0a661012bcb04 100644
--- a/ext/gd/tests/bug36697-mb.phpt
+++ b/ext/gd/tests/bug36697-mb.phpt
@@ -1,11 +1,7 @@
 --TEST--
 Bug #36697 (TrueColor transparency with GIF palette output).
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available\n");
-    }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $dest = __DIR__ . "/36697私はガラスを食べられます.gif";
diff --git a/ext/gd/tests/bug36697.phpt b/ext/gd/tests/bug36697.phpt
index 990d65b2234cb..ae6cc5bc64d15 100644
--- a/ext/gd/tests/bug36697.phpt
+++ b/ext/gd/tests/bug36697.phpt
@@ -1,11 +1,7 @@
 --TEST--
 Bug #36697 (TrueColor transparency with GIF palette output).
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available\n");
-    }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $dest = __DIR__ . "/36697.gif";
diff --git a/ext/gd/tests/bug37346-mb.phpt b/ext/gd/tests/bug37346-mb.phpt
index 92a0416985fed..812cbeaa34f18 100644
--- a/ext/gd/tests/bug37346-mb.phpt
+++ b/ext/gd/tests/bug37346-mb.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #37346 (gdimagecreatefromgif, bad colormap)
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatefromgif(__DIR__ . '/bug37346私はガラスを食べられます.gif');
diff --git a/ext/gd/tests/bug37346.phpt b/ext/gd/tests/bug37346.phpt
index 3884024c45485..4d486e381a4f2 100644
--- a/ext/gd/tests/bug37346.phpt
+++ b/ext/gd/tests/bug37346.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #37346 (gdimagecreatefromgif, bad colormap)
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatefromgif(__DIR__ . '/bug37346.gif');
diff --git a/ext/gd/tests/bug37360.phpt b/ext/gd/tests/bug37360.phpt
index 356c877f71539..d88b25922e37d 100644
--- a/ext/gd/tests/bug37360.phpt
+++ b/ext/gd/tests/bug37360.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #37360 (gdimagecreatefromgif, bad image sizes)
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatefromgif(__DIR__ . '/bug37360.gif');
diff --git a/ext/gd/tests/bug38112.phpt b/ext/gd/tests/bug38112.phpt
index 328741a921901..95077ede9b5d0 100644
--- a/ext/gd/tests/bug38112.phpt
+++ b/ext/gd/tests/bug38112.phpt
@@ -1,11 +1,7 @@
 --TEST--
 Bug #38112 (GIF Invalid Code size ).
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available\n");
-    }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatefromgif(__DIR__ . '/bug38112.gif');
diff --git a/ext/gd/tests/bug38179.phpt b/ext/gd/tests/bug38179.phpt
index 84eda6c343e1c..17e9ed28406e5 100644
--- a/ext/gd/tests/bug38179.phpt
+++ b/ext/gd/tests/bug38179.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #38179 (imagecopy from a palette to a truecolor image loses alpha channel)
---SKIPIF--
-<?php
-        if (!function_exists('imagecopy')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $src = imagecreate(5,5);
diff --git a/ext/gd/tests/bug38212-mb.phpt b/ext/gd/tests/bug38212-mb.phpt
index f316aed00b343..709cc6c61c5c1 100644
--- a/ext/gd/tests/bug38212-mb.phpt
+++ b/ext/gd/tests/bug38212-mb.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #38212 (Seg Fault on invalid imagecreatefromgd2part() parameters)
---SKIPIF--
-<?php
-        if (!function_exists('imagecopy')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 require __DIR__ . '/func.inc';
diff --git a/ext/gd/tests/bug38212.phpt b/ext/gd/tests/bug38212.phpt
index 311077141e5ee..4076915be01b7 100644
--- a/ext/gd/tests/bug38212.phpt
+++ b/ext/gd/tests/bug38212.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #38212 (Seg Fault on invalid imagecreatefromgd2part() parameters)
---SKIPIF--
-<?php
-        if (!function_exists('imagecopy')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 require __DIR__ . '/func.inc';
diff --git a/ext/gd/tests/bug39082.phpt b/ext/gd/tests/bug39082.phpt
index e6f1ad757560e..f327dc07308b2 100644
--- a/ext/gd/tests/bug39082.phpt
+++ b/ext/gd/tests/bug39082.phpt
@@ -1,11 +1,7 @@
 --TEST--
 Bug #39082 (Output image to stdout segfaults).
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available\n");
-    }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatetruecolor(1,1);
diff --git a/ext/gd/tests/bug39273.phpt b/ext/gd/tests/bug39273.phpt
index 3fb56761e7f2a..cd3e6c6c9c8ac 100644
--- a/ext/gd/tests/bug39273.phpt
+++ b/ext/gd/tests/bug39273.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #37360 (gdimagecreatefromgif, bad image sizes)
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $small = imagecreatetruecolor(10, 10);
diff --git a/ext/gd/tests/bug39366.phpt b/ext/gd/tests/bug39366.phpt
index c23f9eadf1b65..2fedbcef43dfe 100644
--- a/ext/gd/tests/bug39366.phpt
+++ b/ext/gd/tests/bug39366.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #39366 (imagerotate does not respect alpha with angles>45)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
     if (!function_exists("imagerotate")) die("skip requires bundled GD library\n");
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug39508.phpt b/ext/gd/tests/bug39508.phpt
index 6bfd83614fe42..e7d53b4bc3285 100644
--- a/ext/gd/tests/bug39508.phpt
+++ b/ext/gd/tests/bug39508.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #39508 (imagefill crashes with small images 3 pixels or less)
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatetruecolor(3,1);
diff --git a/ext/gd/tests/bug39780.phpt b/ext/gd/tests/bug39780.phpt
index 700dad46cfce0..0eb8885a139c4 100644
--- a/ext/gd/tests/bug39780.phpt
+++ b/ext/gd/tests/bug39780.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #39780 (PNG image with CRC/data error raises a fatal error)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
     if (!GD_BUNDLED) die("skip requires bundled GD library\n");
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug39780_extern.phpt b/ext/gd/tests/bug39780_extern.phpt
index 52c64534dc427..5409103b516dd 100644
--- a/ext/gd/tests/bug39780_extern.phpt
+++ b/ext/gd/tests/bug39780_extern.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #39780 (PNG image with CRC/data error raises a fatal error)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
     if (GD_BUNDLED) die("skip requires extern GD\n");
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug40764.phpt b/ext/gd/tests/bug40764.phpt
index 8a673207b60cd..761bf71c5b27b 100644
--- a/ext/gd/tests/bug40764.phpt
+++ b/ext/gd/tests/bug40764.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #40764 (line thickness not respected for horizontal and vertical lines)
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $image=imagecreatetruecolor(400, 400);
diff --git a/ext/gd/tests/bug41442.phpt b/ext/gd/tests/bug41442.phpt
index 2f88cc6d6cf27..6ed69f0adda08 100644
--- a/ext/gd/tests/bug41442.phpt
+++ b/ext/gd/tests/bug41442.phpt
@@ -1,10 +1,9 @@
 --TEST--
 Bug #41442 (imagegd2() under output control)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available.");
-    }
     if (!function_exists("imagegd2")) {
         die("skip GD2 support unavailable");
     }
diff --git a/ext/gd/tests/bug42434.phpt b/ext/gd/tests/bug42434.phpt
index 854e49eac4c62..d7cca5ab6b34b 100644
--- a/ext/gd/tests/bug42434.phpt
+++ b/ext/gd/tests/bug42434.phpt
@@ -1,11 +1,7 @@
 --TEST--
 Bug #42434 (ImageLine w/ antialias = 1px shorter)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) {
-    die('skip gd extension not available');
-}
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatetruecolor(10, 2);
diff --git a/ext/gd/tests/bug43073.phpt b/ext/gd/tests/bug43073.phpt
index 4257f6c1a7d8f..699c39bc42637 100644
--- a/ext/gd/tests/bug43073.phpt
+++ b/ext/gd/tests/bug43073.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #43073 (TrueType bounding box is wrong for angle<>0)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
     if(!function_exists('imagettftext')) die('skip imagettftext() not available');
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug43121.phpt b/ext/gd/tests/bug43121.phpt
index 38668fdfbbcd6..21550a03c88d4 100644
--- a/ext/gd/tests/bug43121.phpt
+++ b/ext/gd/tests/bug43121.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #43121 (gdImageFill with IMG_COLOR_TILED crashes httpd)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
     if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.0', '<')) {
         die("skip test requires GD 2.2.0 or higher");
     }
diff --git a/ext/gd/tests/bug43475.phpt b/ext/gd/tests/bug43475.phpt
index 71c567570a63c..8944b57e3cde7 100644
--- a/ext/gd/tests/bug43475.phpt
+++ b/ext/gd/tests/bug43475.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #43475 (Thick styled lines have scrambled patterns)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
     if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
         die("skip test requires GD 2.2.2 or higher");
     }
diff --git a/ext/gd/tests/bug43828.phpt b/ext/gd/tests/bug43828.phpt
index de2b51ea3bdc5..8a0caf5decc35 100644
--- a/ext/gd/tests/bug43828.phpt
+++ b/ext/gd/tests/bug43828.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #43828 (broken transparency of imagearc for truecolor in blendingmode)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip ext/gd not available');
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
     die("skip test requires GD 2.2.2 or higher");
 }
diff --git a/ext/gd/tests/bug44849.phpt b/ext/gd/tests/bug44849.phpt
index 4710f218f9b21..b17cf9d43d74d 100644
--- a/ext/gd/tests/bug44849.phpt
+++ b/ext/gd/tests/bug44849.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #44849 (imagecolorclosesthwb is not available on Windows)
---SKIPIF--
-<?php
-    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
     var_dump(function_exists('imagecolorclosesthwb'));
diff --git a/ext/gd/tests/bug45799.phpt b/ext/gd/tests/bug45799.phpt
index fd7af45b91b8c..1678ada41e887 100644
--- a/ext/gd/tests/bug45799.phpt
+++ b/ext/gd/tests/bug45799.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #45799 (imagepng() crashes on empty image).
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $img = imagecreate(500,500);
diff --git a/ext/gd/tests/bug47946.phpt b/ext/gd/tests/bug47946.phpt
index 8c262eaabdaaf..39e5aef9edffc 100644
--- a/ext/gd/tests/bug47946.phpt
+++ b/ext/gd/tests/bug47946.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #47946 (ImageConvolution overwrites background)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.5', '<=')) die('skip upstream fix not yet released');
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug48555.phpt b/ext/gd/tests/bug48555.phpt
index 68c533d75a987..37158812cb8c1 100644
--- a/ext/gd/tests/bug48555.phpt
+++ b/ext/gd/tests/bug48555.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #48555 (ImageFTBBox() differs from previous versions for texts with new lines)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
     if(!function_exists('imageftbbox')) die('skip imageftbbox() not available');
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug48732-mb.phpt b/ext/gd/tests/bug48732-mb.phpt
index 8f27d28086433..13a881254c203 100644
--- a/ext/gd/tests/bug48732-mb.phpt
+++ b/ext/gd/tests/bug48732-mb.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #48732 (TTF Bounding box wrong for letters below baseline)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
     if(!function_exists('imagefttext')) die('skip imagefttext() not available');
     if (substr(PHP_OS, 0, 3) == 'WIN') die('skip UTF-8 font file names not yet supported on Windows');
 ?>
diff --git a/ext/gd/tests/bug48732.phpt b/ext/gd/tests/bug48732.phpt
index 323690e2a0919..44e4204503ef7 100644
--- a/ext/gd/tests/bug48732.phpt
+++ b/ext/gd/tests/bug48732.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #48732 (TTF Bounding box wrong for letters below baseline)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
     if(!function_exists('imagefttext')) die('skip imagefttext() not available');
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug48801-mb.phpt b/ext/gd/tests/bug48801-mb.phpt
index 435af2d3904ee..247161518b194 100644
--- a/ext/gd/tests/bug48801-mb.phpt
+++ b/ext/gd/tests/bug48801-mb.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #48801 (Problem with imagettfbbox)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
     if(!function_exists('imageftbbox')) die('skip imageftbbox() not available');
     if (substr(PHP_OS, 0, 3) == 'WIN') die('skip UTF-8 font file names not yet supported on Windows');
 ?>
diff --git a/ext/gd/tests/bug48801.phpt b/ext/gd/tests/bug48801.phpt
index 0975d7d774517..361bf59a65b9f 100644
--- a/ext/gd/tests/bug48801.phpt
+++ b/ext/gd/tests/bug48801.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #48801 (Problem with imagettfbbox)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
     if(!function_exists('imageftbbox')) die('skip imageftbbox() not available');
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug49600.phpt b/ext/gd/tests/bug49600.phpt
index 3817391765cf7..f047bd7cc8753 100644
--- a/ext/gd/tests/bug49600.phpt
+++ b/ext/gd/tests/bug49600.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #49600 (imageTTFText text shifted right)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
     if(!function_exists('imagettftext')) die('skip imagettftext() not available');
     if(!function_exists('imagettfbbox')) die('skip imagettfbbox() not available');
 ?>
diff --git a/ext/gd/tests/bug50194.phpt b/ext/gd/tests/bug50194.phpt
index 2815ee1609c8b..2addfe0e8325d 100644
--- a/ext/gd/tests/bug50194.phpt
+++ b/ext/gd/tests/bug50194.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #50194 (imagettftext broken on transparent background w/o alphablending)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
 if (!function_exists('imagettftext')) die('skip imagettftext() not available');
 //die('skip freetype issues');
 ?>
diff --git a/ext/gd/tests/bug51263.phpt b/ext/gd/tests/bug51263.phpt
index 04d827709465e..7aef8381c4a37 100644
--- a/ext/gd/tests/bug51263.phpt
+++ b/ext/gd/tests/bug51263.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #51263 (imagettftext and rotated text uses wrong baseline)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
     if(!function_exists('imagettftext')) die('skip imagettftext() not available');
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug51671.phpt b/ext/gd/tests/bug51671.phpt
index 1520e84f35e32..266832f057360 100644
--- a/ext/gd/tests/bug51671.phpt
+++ b/ext/gd/tests/bug51671.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #51671 (imagefill does not work correctly for small images)
---SKIPIF--
-<?php
-    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $w = 1;
diff --git a/ext/gd/tests/bug52070.phpt b/ext/gd/tests/bug52070.phpt
index 4ff97c909cec2..1ba28affdbfcd 100644
--- a/ext/gd/tests/bug52070.phpt
+++ b/ext/gd/tests/bug52070.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #52070 (imagedashedline() - dashed line sometimes is not visible)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreate(1200, 800);
diff --git a/ext/gd/tests/bug53154.phpt b/ext/gd/tests/bug53154.phpt
index 0c5ee9cc99e95..e27020848bc5d 100644
--- a/ext/gd/tests/bug53154.phpt
+++ b/ext/gd/tests/bug53154.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #53154 (Zero-height rectangle has whiskers)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
     die("skip test requires GD 2.2.2 or higher");
 }
diff --git a/ext/gd/tests/bug53156.phpt b/ext/gd/tests/bug53156.phpt
index 63482217a8d78..9171e75616c0c 100644
--- a/ext/gd/tests/bug53156.phpt
+++ b/ext/gd/tests/bug53156.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #53156 (imagerectangle problem with point ordering)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.3', '<')) {
     die("skip test requires GD 2.3 or newer");
 }
diff --git a/ext/gd/tests/bug53504.phpt b/ext/gd/tests/bug53504.phpt
index 3a6a06006aa06..83073d82a21ab 100644
--- a/ext/gd/tests/bug53504.phpt
+++ b/ext/gd/tests/bug53504.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #53504 imagettfbbox/imageftbbox gives incorrect values for bounding box
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
     if(!function_exists('imageftbbox')) die('skip imageftbbox() not available');
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug53640.phpt b/ext/gd/tests/bug53640.phpt
index 7e8217c27fc69..c5d009826b6cb 100644
--- a/ext/gd/tests/bug53640.phpt
+++ b/ext/gd/tests/bug53640.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #53640 (XBM images require width to be multiple of 8)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.3', '<')) {
     die("skip test requires GD 2.2.3 or higher");
 }
diff --git a/ext/gd/tests/bug55005.phpt b/ext/gd/tests/bug55005.phpt
index 4514b80fed3b5..d29dfc61084f7 100644
--- a/ext/gd/tests/bug55005.phpt
+++ b/ext/gd/tests/bug55005.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #55005 (imagepolygon num_points requirement)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 require_once __DIR__ . '/func.inc';
diff --git a/ext/gd/tests/bug60160.phpt b/ext/gd/tests/bug60160.phpt
index ed7b463c305e2..beee52ff386b2 100644
--- a/ext/gd/tests/bug60160.phpt
+++ b/ext/gd/tests/bug60160.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #60160 (imagefill does not work correctly for small images) @see bug51671
---SKIPIF--
-<?php
-    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $w = 3;
diff --git a/ext/gd/tests/bug61221.phpt b/ext/gd/tests/bug61221.phpt
index 42365da71ff07..97a90db045b3a 100644
--- a/ext/gd/tests/bug61221.phpt
+++ b/ext/gd/tests/bug61221.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #61221 - imagegammacorrect function loses alpha channel
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $imagew = 50;
diff --git a/ext/gd/tests/bug64641.phpt b/ext/gd/tests/bug64641.phpt
index 69f76e5719afb..d300bd8fc6a0a 100644
--- a/ext/gd/tests/bug64641.phpt
+++ b/ext/gd/tests/bug64641.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #64641 (imagefilledpolygon doesn't draw horizontal line)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die("skip gd extension not available\n");
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
     die("skip test requires GD 2.2.2 or higher");
 }
diff --git a/ext/gd/tests/bug65148.phpt b/ext/gd/tests/bug65148.phpt
index 1ce5480dd6b2a..4dfa13ccaa92a 100644
--- a/ext/gd/tests/bug65148.phpt
+++ b/ext/gd/tests/bug65148.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #65148 (imagerotate may alter image dimensions)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension is not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/bug66005.phpt b/ext/gd/tests/bug66005.phpt
index 9d63524570d13..78e0f481dab17 100644
--- a/ext/gd/tests/bug66005.phpt
+++ b/ext/gd/tests/bug66005.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #66005 (imagecopy does not support 1bit transparency on truecolor images)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $dest = imagecreatetruecolor(150, 50);
diff --git a/ext/gd/tests/bug66339-mb.phpt b/ext/gd/tests/bug66339-mb.phpt
index 76e3af7c8f34a..2eb30c9cd1645 100644
--- a/ext/gd/tests/bug66339-mb.phpt
+++ b/ext/gd/tests/bug66339-mb.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #66339 (PHP segfaults in imagexbm)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreate(8, 8);
diff --git a/ext/gd/tests/bug66339.phpt b/ext/gd/tests/bug66339.phpt
index a5ef5c6915b3a..b3d105ca831b0 100644
--- a/ext/gd/tests/bug66339.phpt
+++ b/ext/gd/tests/bug66339.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #66339 (PHP segfaults in imagexbm)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreate(8, 8);
diff --git a/ext/gd/tests/bug66356.phpt b/ext/gd/tests/bug66356.phpt
index 0803ed48bdfdd..e15308dc1c183 100644
--- a/ext/gd/tests/bug66356.phpt
+++ b/ext/gd/tests/bug66356.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #66356 (Heap Overflow Vulnerability in imagecrop())
---SKIPIF--
-<?php
-    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $img = imagecreatetruecolor(10, 10);
diff --git a/ext/gd/tests/bug66387.phpt b/ext/gd/tests/bug66387.phpt
index 04ab0b688e293..de44ac8054d97 100644
--- a/ext/gd/tests/bug66387.phpt
+++ b/ext/gd/tests/bug66387.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #66387 (Stack overflow with imagefilltoborder)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available!');
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.1', '<')) {
     die("skip test requires GD 2.2.1 or higher");
 }
diff --git a/ext/gd/tests/bug66590.phpt b/ext/gd/tests/bug66590.phpt
index 7fdeae091c3f9..91e7085f7bbf1 100644
--- a/ext/gd/tests/bug66590.phpt
+++ b/ext/gd/tests/bug66590.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #66590 (imagewebp() doesn't pad to even length)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.0', '<')) {
     die("skip test requires GD 2.2.0 or higher");
 }
diff --git a/ext/gd/tests/bug66590_1.phpt b/ext/gd/tests/bug66590_1.phpt
index 9e598d1eae9f2..1f97a902554fd 100644
--- a/ext/gd/tests/bug66590_1.phpt
+++ b/ext/gd/tests/bug66590_1.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #66590 (imagewebp() doesn't pad to even length) - segfault
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
 if (!function_exists('imagewebp')) die('skip WebP support not available');
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug66882.phpt b/ext/gd/tests/bug66882.phpt
index 6dfbdfe06de9a..11e606e2d2290 100644
--- a/ext/gd/tests/bug66882.phpt
+++ b/ext/gd/tests/bug66882.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #66882 (imagerotate by -90 degrees truncates image by 1px)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagerotate(imagecreate(10, 10), -90, 0);
diff --git a/ext/gd/tests/bug67248.phpt b/ext/gd/tests/bug67248.phpt
index c48512e281ebe..a002f71c7fd35 100644
--- a/ext/gd/tests/bug67248.phpt
+++ b/ext/gd/tests/bug67248.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #67248 (imageaffinematrixget missing check of parameters)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-        if(!extension_loaded('gd')){ die('skip gd extension not available'); }
         if(!function_exists('imageaffinematrixget')) die('skip imageaffinematrixget() not available');
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug67325.phpt b/ext/gd/tests/bug67325.phpt
index fe369ee949a74..b1e84242a4a3b 100644
--- a/ext/gd/tests/bug67325.phpt
+++ b/ext/gd/tests/bug67325.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #67325 (imagetruecolortopalette: white is duplicated in palette)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.3', '<=')) {
     die("skip test requires newer than GD 2.2.3");
 }
diff --git a/ext/gd/tests/bug67447.phpt b/ext/gd/tests/bug67447.phpt
index 985183effcafa..e78e272ff2e7b 100644
--- a/ext/gd/tests/bug67447.phpt
+++ b/ext/gd/tests/bug67447.phpt
@@ -1,11 +1,7 @@
 --TEST--
 Bug #67447 (imagecrop() adds a black line when cropping)
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available\n");
-    }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 // true color
diff --git a/ext/gd/tests/bug69024.phpt b/ext/gd/tests/bug69024.phpt
index f2113fc44fffd..da80a5b609a87 100644
--- a/ext/gd/tests/bug69024.phpt
+++ b/ext/gd/tests/bug69024.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #69024 (imagescale segfault with palette based image)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreate(256, 256);
diff --git a/ext/gd/tests/bug70047.phpt b/ext/gd/tests/bug70047.phpt
index 7dbf8ab59d449..77142726c08f0 100644
--- a/ext/gd/tests/bug70047.phpt
+++ b/ext/gd/tests/bug70047.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #70047 (gd_info() doesn't report WebP support)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $info = gd_info();
diff --git a/ext/gd/tests/bug70102.phpt b/ext/gd/tests/bug70102.phpt
index 81b189d4f4a8d..bfdcbd377a3a2 100644
--- a/ext/gd/tests/bug70102.phpt
+++ b/ext/gd/tests/bug70102.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #70102 (imagecreatefromwebm() shifts colors)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.0', '<')) {
     die("skip test requires GD 2.2.0 or higher");
 }
diff --git a/ext/gd/tests/bug70976.phpt b/ext/gd/tests/bug70976.phpt
index 6af034383fdf6..114084e139594 100644
--- a/ext/gd/tests/bug70976.phpt
+++ b/ext/gd/tests/bug70976.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #70976 (Memory Read via gdImageRotateInterpolated Array Index Out of Bounds)
---SKIPIF--
-<?php
-    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $img = imagerotate(imagecreate(10,10),45,0x7ffffff9);
diff --git a/ext/gd/tests/bug71912-mb.phpt b/ext/gd/tests/bug71912-mb.phpt
index 32a6ee00bc71b..59e422b875068 100644
--- a/ext/gd/tests/bug71912-mb.phpt
+++ b/ext/gd/tests/bug71912-mb.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #71912 (libgd: signedness vulnerability)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-        if(!extension_loaded('gd')){ die('skip gd extension not available'); }
         if(!function_exists('imagecreatefromgd2')) die('skip imagecreatefromgd2() not available');
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug71912.phpt b/ext/gd/tests/bug71912.phpt
index 30bde45d214c5..b006cdc3cc4a1 100644
--- a/ext/gd/tests/bug71912.phpt
+++ b/ext/gd/tests/bug71912.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #71912 (libgd: signedness vulnerability)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-        if(!extension_loaded('gd')){ die('skip gd extension not available'); }
         if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.0', '<')) {
             die("skip test requires GD 2.2.0 or higher");
         }
diff --git a/ext/gd/tests/bug71952.phpt b/ext/gd/tests/bug71952.phpt
index 0a4a8e31a0bfd..fa583fc795e82 100644
--- a/ext/gd/tests/bug71952.phpt
+++ b/ext/gd/tests/bug71952.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #71952 (Corruption inside imageaffinematrixget)
---SKIPIF--
-<?php
-    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $vals=[str_repeat("A","200"),0,1,2,3,4,5,6,7,8,9];
diff --git a/ext/gd/tests/bug72227.phpt b/ext/gd/tests/bug72227.phpt
index 943d961f46c41..cc52d6226f7cd 100644
--- a/ext/gd/tests/bug72227.phpt
+++ b/ext/gd/tests/bug72227.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #72227: imagescale out-of-bounds read
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/bug72298.phpt b/ext/gd/tests/bug72298.phpt
index 0224c2ed4fdc3..4f24390c59424 100644
--- a/ext/gd/tests/bug72298.phpt
+++ b/ext/gd/tests/bug72298.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #72298: pass2_no_dither out-of-bounds access
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $img = imagecreatetruecolor (1 , 1);
diff --git a/ext/gd/tests/bug72337.phpt b/ext/gd/tests/bug72337.phpt
index 7b8a86957733a..dab2f32a5c147 100644
--- a/ext/gd/tests/bug72337.phpt
+++ b/ext/gd/tests/bug72337.phpt
@@ -1,9 +1,7 @@
 --TEST--
  #72337	segfault in imagescale with new dimensions being <=0)
---SKIPIF--
-<?php
-        if (!function_exists('imagescale')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatetruecolor(1, 1);
diff --git a/ext/gd/tests/bug72339.phpt b/ext/gd/tests/bug72339.phpt
index 442f6ab290fff..e1c2230babb50 100644
--- a/ext/gd/tests/bug72339.phpt
+++ b/ext/gd/tests/bug72339.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
 if (!function_exists("imagecreatefromgd2")) print "skip";
diff --git a/ext/gd/tests/bug72482.phpt b/ext/gd/tests/bug72482.phpt
index 548921d559f50..0c61d4228391b 100644
--- a/ext/gd/tests/bug72482.phpt
+++ b/ext/gd/tests/bug72482.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #72482 (Ilegal write/read access caused by gdImageAALine overflow)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $img = imagecreatetruecolor(13, 1007);
diff --git a/ext/gd/tests/bug72482_2.phpt b/ext/gd/tests/bug72482_2.phpt
index f9f5833274dc4..89f5bb28a77bd 100644
--- a/ext/gd/tests/bug72482_2.phpt
+++ b/ext/gd/tests/bug72482_2.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug 72482 (Ilegal write/read access caused by gdImageAALine overflow)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'func.inc';
diff --git a/ext/gd/tests/bug72494.phpt b/ext/gd/tests/bug72494.phpt
index 97663cedf6035..35e0359eae27d 100644
--- a/ext/gd/tests/bug72494.phpt
+++ b/ext/gd/tests/bug72494.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #72494 (imagecropauto out-of-bounds access)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 require __DIR__ . '/func.inc';
diff --git a/ext/gd/tests/bug72512.phpt b/ext/gd/tests/bug72512.phpt
index 96b6de10237d7..479b71e5f0502 100644
--- a/ext/gd/tests/bug72512.phpt
+++ b/ext/gd/tests/bug72512.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #19366 (gdimagefill() function crashes (fixed in bundled libgd))
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
     if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
         die("skip test requires GD 2.2.2 or higher");
     }
diff --git a/ext/gd/tests/bug72512_0.phpt b/ext/gd/tests/bug72512_0.phpt
index d9c6c8e297ca1..7fd5be119fa3d 100644
--- a/ext/gd/tests/bug72512_0.phpt
+++ b/ext/gd/tests/bug72512_0.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #72512 gdImageTrueColorToPaletteBody allows arbitrary write/read access, var 0
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
     if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
         die("skip test requires GD 2.2.2 or higher");
     }
diff --git a/ext/gd/tests/bug72512_1.phpt b/ext/gd/tests/bug72512_1.phpt
index 0c5ae7cb767ce..d520db149283b 100644
--- a/ext/gd/tests/bug72512_1.phpt
+++ b/ext/gd/tests/bug72512_1.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #72512 gdImageTrueColorToPaletteBody allows arbitrary write/read access, var 1
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
     if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
         die("skip test requires GD 2.2.2 or higher");
     }
diff --git a/ext/gd/tests/bug72596.phpt b/ext/gd/tests/bug72596.phpt
index 2eb7dadb76c48..c57a1ebae356b 100644
--- a/ext/gd/tests/bug72596.phpt
+++ b/ext/gd/tests/bug72596.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #72596 (imagetypes function won't advertise WEBP support)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 var_dump(function_exists('imagewebp') === (bool) (imagetypes() & IMG_WEBP));
diff --git a/ext/gd/tests/bug72604.phpt b/ext/gd/tests/bug72604.phpt
index 5cbaba7504abb..706d7891c3220 100644
--- a/ext/gd/tests/bug72604.phpt
+++ b/ext/gd/tests/bug72604.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #72604 (imagearc() ignores thickness for full arcs)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip requires ext/gd');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatetruecolor(100, 100);
diff --git a/ext/gd/tests/bug72696.phpt b/ext/gd/tests/bug72696.phpt
index 4f0d9e7f1d256..ebe9aac64cd73 100644
--- a/ext/gd/tests/bug72696.phpt
+++ b/ext/gd/tests/bug72696.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #72696 (imagefilltoborder stackoverflow on truecolor images)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatetruecolor(10, 10);
diff --git a/ext/gd/tests/bug72697.phpt b/ext/gd/tests/bug72697.phpt
index 6861437df2776..a7ab6114db34e 100644
--- a/ext/gd/tests/bug72697.phpt
+++ b/ext/gd/tests/bug72697.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #72697: select_colors write out-of-bounds
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!function_exists("imagecreatetruecolor")) die("skip");
 if (PHP_INT_MAX !== 9223372036854775807) die("skip for 64-bit long systems only");
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug72709.phpt b/ext/gd/tests/bug72709.phpt
index 8915e4f57b693..7ea80df9a78e4 100644
--- a/ext/gd/tests/bug72709.phpt
+++ b/ext/gd/tests/bug72709.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #72709 (imagesetstyle() causes OOB read for empty $styles)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip ext/gd not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatetruecolor(1, 1);
diff --git a/ext/gd/tests/bug72730.phpt b/ext/gd/tests/bug72730.phpt
index bbc01eb68baa6..6e0230dfb9ebc 100644
--- a/ext/gd/tests/bug72730.phpt
+++ b/ext/gd/tests/bug72730.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #72730: imagegammacorrect allows arbitrary write access
---SKIPIF--
-<?php
-if (!function_exists("imagecreatetruecolor")) die("skip");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/bug72913.phpt b/ext/gd/tests/bug72913.phpt
index 3ec0766982540..c3a7e9f9f56cf 100644
--- a/ext/gd/tests/bug72913.phpt
+++ b/ext/gd/tests/bug72913.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #72913 (imagecopy() loses single-color transparency on palette images)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $base64 = 'iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAIAAACRXR/mAAAABnRSTlMAAAAAAABu'
diff --git a/ext/gd/tests/bug73155.phpt b/ext/gd/tests/bug73155.phpt
index 96ba12a469f64..0c77585aa5527 100644
--- a/ext/gd/tests/bug73155.phpt
+++ b/ext/gd/tests/bug73155.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #73155 (imagegd2() writes wrong chunk sizes on boundaries)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreate(64, 64);
diff --git a/ext/gd/tests/bug73157.phpt b/ext/gd/tests/bug73157.phpt
index f0f19fdf23663..95c9daf7014ac 100644
--- a/ext/gd/tests/bug73157.phpt
+++ b/ext/gd/tests/bug73157.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #73157 (imagegd2() ignores 3rd param if 4 are given)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreate(8, 8);
diff --git a/ext/gd/tests/bug73159.phpt b/ext/gd/tests/bug73159.phpt
index ae11f3012b60b..e430c827bf680 100644
--- a/ext/gd/tests/bug73159.phpt
+++ b/ext/gd/tests/bug73159.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #73159 (imagegd2(): unrecognized formats may result in corrupted files)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatetruecolor(10, 10);
diff --git a/ext/gd/tests/bug73161.phpt b/ext/gd/tests/bug73161.phpt
index 90fd26274556f..cb43d640bd47a 100644
--- a/ext/gd/tests/bug73161.phpt
+++ b/ext/gd/tests/bug73161.phpt
@@ -2,10 +2,8 @@
 Bug #73161 (imagecreatefromgd2() may leak memory)
 --DESCRIPTION--
 We're testing for a memory leak that might not even show up with valgrind.
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatefromgd2(__DIR__ . DIRECTORY_SEPARATOR . 'bug73161.gd2');
diff --git a/ext/gd/tests/bug73213.phpt b/ext/gd/tests/bug73213.phpt
index 3c8f33079beae..c4c4bd6feeaf1 100644
--- a/ext/gd/tests/bug73213.phpt
+++ b/ext/gd/tests/bug73213.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #73213 (Integer overflow in imageline() with antialiasing)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'func.inc';
diff --git a/ext/gd/tests/bug73272.phpt b/ext/gd/tests/bug73272.phpt
index 33d7b4155e9dc..cf10eb227ae11 100644
--- a/ext/gd/tests/bug73272.phpt
+++ b/ext/gd/tests/bug73272.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #73272 (imagescale() is not affected by, but affects imagesetinterpolation())
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'func.inc';
diff --git a/ext/gd/tests/bug73279.phpt b/ext/gd/tests/bug73279.phpt
index 886b61c55b8bb..d1ae78087b246 100644
--- a/ext/gd/tests/bug73279.phpt
+++ b/ext/gd/tests/bug73279.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #73279 (Integer overflow in gdImageScaleBilinearPalette())
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.4', '<')) {
     die('skip only for bundled libgd or external libgd >= 2.2.4');
 }
diff --git a/ext/gd/tests/bug73279_old.phpt b/ext/gd/tests/bug73279_old.phpt
index 1db9861b0c49f..9d0a430e86513 100644
--- a/ext/gd/tests/bug73279_old.phpt
+++ b/ext/gd/tests/bug73279_old.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #73279 (Integer overflow in gdImageScaleBilinearPalette())
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
 if (GD_BUNDLED || version_compare(GD_VERSION, '2.2.4', '>=')) {
     die('skip only for external libgd < 2.2.4');
 }
diff --git a/ext/gd/tests/bug73281.phpt b/ext/gd/tests/bug73281.phpt
index 81bb2d2d284b1..99101ada24e6d 100644
--- a/ext/gd/tests/bug73281.phpt
+++ b/ext/gd/tests/bug73281.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #73281 (imagescale(…, IMG_BILINEAR_FIXED) can cause black border)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.3', '<=')) die('skip upstream fix not yet released');
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug73291.phpt b/ext/gd/tests/bug73291.phpt
index a3fd5b3c10138..e23b1fc7d17ab 100644
--- a/ext/gd/tests/bug73291.phpt
+++ b/ext/gd/tests/bug73291.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #73291 (imagecropauto() $threshold differs from external libgd)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/bug73549.phpt b/ext/gd/tests/bug73549.phpt
index 8194d43e721fd..d25941dd565d3 100644
--- a/ext/gd/tests/bug73549.phpt
+++ b/ext/gd/tests/bug73549.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #73549 (Use after free when stream is passed to imagepng)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $stream = fopen(__DIR__ . DIRECTORY_SEPARATOR . 'bug73549.png', 'w');
diff --git a/ext/gd/tests/bug73614.phpt b/ext/gd/tests/bug73614.phpt
index dc0ccc10d9ebf..def4d37421160 100644
--- a/ext/gd/tests/bug73614.phpt
+++ b/ext/gd/tests/bug73614.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #73614 (gdImageFilledArc() doesn't properly draw pies)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.5', '<=')) die('skip upstream bugfix not yet released');
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug73868.phpt b/ext/gd/tests/bug73868.phpt
index ed59ac7be3068..1d166b4037957 100644
--- a/ext/gd/tests/bug73868.phpt
+++ b/ext/gd/tests/bug73868.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug 73868 (DOS vulnerability in gdImageCreateFromGd2Ctx())
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 var_dump(imagecreatefromgd2(__DIR__ . DIRECTORY_SEPARATOR . 'bug73868.gd2'));
diff --git a/ext/gd/tests/bug73869.phpt b/ext/gd/tests/bug73869.phpt
index 6adb8c09a4fb1..ffea89b6bf8a7 100644
--- a/ext/gd/tests/bug73869.phpt
+++ b/ext/gd/tests/bug73869.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #73869 (Signed Integer Overflow gd_io.c)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 var_dump(imagecreatefromgd2(__DIR__ . DIRECTORY_SEPARATOR . 'bug73869a.gd2'));
diff --git a/ext/gd/tests/bug73957.phpt b/ext/gd/tests/bug73957.phpt
index 0ab715b1781f2..b754d16377eb4 100644
--- a/ext/gd/tests/bug73957.phpt
+++ b/ext/gd/tests/bug73957.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #73957 (signed integer conversion in imagescale())
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
 if (PHP_INT_SIZE != 8) die('skip this test is for 64bit platforms only');
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug73968.phpt b/ext/gd/tests/bug73968.phpt
index c1101c61bf06a..4c50c97173d0c 100644
--- a/ext/gd/tests/bug73968.phpt
+++ b/ext/gd/tests/bug73968.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #73968 (Premature failing of XBM reading)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatefromxbm(__DIR__ . DIRECTORY_SEPARATOR . 'bug73968.xbm');
diff --git a/ext/gd/tests/bug74031.phpt b/ext/gd/tests/bug74031.phpt
index 5a2b483678425..b4efa6b749e8e 100644
--- a/ext/gd/tests/bug74031.phpt
+++ b/ext/gd/tests/bug74031.phpt
@@ -1,9 +1,7 @@
 --TEST--
 (Bug #74031) ReflectionFunction for imagepng returns wrong number of parameters
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/bug74435.phpt b/ext/gd/tests/bug74435.phpt
index 78f2103247a89..91b6a14309133 100644
--- a/ext/gd/tests/bug74435.phpt
+++ b/ext/gd/tests/bug74435.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #74435 (Buffer over-read into uninitialized memory)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatefromgif(__DIR__ . DIRECTORY_SEPARATOR . 'bug74435.gif');
diff --git a/ext/gd/tests/bug75111.phpt b/ext/gd/tests/bug75111.phpt
index e2e13f3b73640..dbe54c45e1f12 100644
--- a/ext/gd/tests/bug75111.phpt
+++ b/ext/gd/tests/bug75111.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #75111 (Memory disclosure or DoS via crafted .bmp image)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 // craft BMP image
diff --git a/ext/gd/tests/bug75124.phpt b/ext/gd/tests/bug75124.phpt
index 47c313fa84fb9..47b36157fec90 100644
--- a/ext/gd/tests/bug75124.phpt
+++ b/ext/gd/tests/bug75124.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #75124 (gdImageGrayScale() may produce colors)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.5', '<')) {
     die('skip only for bundled libgd or external libgd >= 2.2.5');
 }
diff --git a/ext/gd/tests/bug75571.phpt b/ext/gd/tests/bug75571.phpt
index 898f1ecbad5c3..7c19b31266900 100644
--- a/ext/gd/tests/bug75571.phpt
+++ b/ext/gd/tests/bug75571.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #75571 (Infinite loop in GIF reading causing DoS)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 var_dump(imagecreatefromgif(__DIR__ . '/bug75571.gif'));
diff --git a/ext/gd/tests/bug76041.phpt b/ext/gd/tests/bug76041.phpt
index 960b100225f42..888c601a0d677 100644
--- a/ext/gd/tests/bug76041.phpt
+++ b/ext/gd/tests/bug76041.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #76041 (null pointer access crashed php)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im=imagecreate(100, 100);
diff --git a/ext/gd/tests/bug77195.phpt b/ext/gd/tests/bug77195.phpt
index fc788a6667574..1f42a0febbee6 100644
--- a/ext/gd/tests/bug77195.phpt
+++ b/ext/gd/tests/bug77195.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #77195 (Incorrect error handling of imagecreatefromjpeg())
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
 if (!gd_info()['JPEG Support']) die('skip JPEG support not available');
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug77198_auto.phpt b/ext/gd/tests/bug77198_auto.phpt
index b010f97483906..9df67d7f2ff6b 100644
--- a/ext/gd/tests/bug77198_auto.phpt
+++ b/ext/gd/tests/bug77198_auto.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #77198 (auto cropping has insufficient precision)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
 if (!GD_BUNDLED) die('skip upstream bugfix has not been released');
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug77198_threshold.phpt b/ext/gd/tests/bug77198_threshold.phpt
index a7135ee07ee78..e164286afca5f 100644
--- a/ext/gd/tests/bug77198_threshold.phpt
+++ b/ext/gd/tests/bug77198_threshold.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #77198 (threshold cropping has insufficient precision)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
 if (!GD_BUNDLED) die('skip upstream bugfix has not been released');
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug77200.phpt b/ext/gd/tests/bug77200.phpt
index b67376067121e..de98da00ef847 100644
--- a/ext/gd/tests/bug77200.phpt
+++ b/ext/gd/tests/bug77200.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #77200 (imagecropauto(…, GD_CROP_SIDES) crops left but not right)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
 if (!GD_BUNDLED) die('skip upstream bugfix has not been released');
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug77269.phpt b/ext/gd/tests/bug77269.phpt
index 2bd5758e1a903..5d1f73a8bf005 100644
--- a/ext/gd/tests/bug77269.phpt
+++ b/ext/gd/tests/bug77269.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #77269 (Potential unsigned underflow in gdImageScale)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 ?>
 --INI--
diff --git a/ext/gd/tests/bug77270.phpt b/ext/gd/tests/bug77270.phpt
index 2250fefd206e6..33246880c53d7 100644
--- a/ext/gd/tests/bug77270.phpt
+++ b/ext/gd/tests/bug77270.phpt
@@ -2,9 +2,10 @@
 Bug #77270 (imagecolormatch Out Of Bounds Write on Heap)
 --INI--
 memory_limit=-1
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.5', '<=')) die('skip upstream bugfix has not been released');
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug77272.phpt b/ext/gd/tests/bug77272.phpt
index 678333f06c0eb..4de532a5c7b3e 100644
--- a/ext/gd/tests/bug77272.phpt
+++ b/ext/gd/tests/bug77272.phpt
@@ -2,9 +2,10 @@
 Bug #77272 (imagescale() may return image resource on failure)
 --INI--
 memory_limit=-1
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.5', '<=')) die('skip upstream fix not yet released');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 ?>
diff --git a/ext/gd/tests/bug77391.phpt b/ext/gd/tests/bug77391.phpt
index fbfa8a8026ebd..6f07ce57da1a5 100644
--- a/ext/gd/tests/bug77391.phpt
+++ b/ext/gd/tests/bug77391.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #77391 (1bpp BMPs may fail to be loaded)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.5', '<=')) die('skip upstream not yet fixed');
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug77479.phpt b/ext/gd/tests/bug77479.phpt
index e57da564392d1..332b2210715cc 100644
--- a/ext/gd/tests/bug77479.phpt
+++ b/ext/gd/tests/bug77479.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #77479 (imagewbmp() segfaults with very large image)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 ?>
 --INI--
diff --git a/ext/gd/tests/bug77700.phpt b/ext/gd/tests/bug77700.phpt
index a14a2259ebc6d..5faf34f5ef62a 100644
--- a/ext/gd/tests/bug77700.phpt
+++ b/ext/gd/tests/bug77700.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #77700 (Writing truecolor images as GIF ignores interlace flag)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatetruecolor(10, 10);
diff --git a/ext/gd/tests/bug77943.phpt b/ext/gd/tests/bug77943.phpt
index 5a64eb85b4959..8ed4114128f25 100644
--- a/ext/gd/tests/bug77943.phpt
+++ b/ext/gd/tests/bug77943.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #77943 (imageantialias($image, false); does not work)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 require_once __DIR__ . '/func.inc';
diff --git a/ext/gd/tests/bug77973.phpt b/ext/gd/tests/bug77973.phpt
index 434cc4449e1a4..38b41e1ca91f3 100644
--- a/ext/gd/tests/bug77973.phpt
+++ b/ext/gd/tests/bug77973.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #77973 (Uninitialized read in gdImageCreateFromXbm)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die("skip gd extension not available");
 if (!function_exists('imagecreatefromxbm')) die("skip imagecreatefromxbm not available");
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug79067.phpt b/ext/gd/tests/bug79067.phpt
index 1442b7fb56466..adea631b84bd9 100644
--- a/ext/gd/tests/bug79067.phpt
+++ b/ext/gd/tests/bug79067.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #79067 (gdTransformAffineCopy() may use unitialized values)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $matrix = [1, 1, 1, 1, 1, 1];
diff --git a/ext/gd/tests/bug79068.phpt b/ext/gd/tests/bug79068.phpt
index 835b0b3670ec1..bea2636bd2f85 100644
--- a/ext/gd/tests/bug79068.phpt
+++ b/ext/gd/tests/bug79068.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #79068 (gdTransformAffineCopy() changes interpolation method)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $src = imagecreatetruecolor(100, 100);
diff --git a/ext/gd/tests/bug79615.phpt b/ext/gd/tests/bug79615.phpt
index b7cf9175c5669..58175a4eef1c9 100644
--- a/ext/gd/tests/bug79615.phpt
+++ b/ext/gd/tests/bug79615.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #79615 (Wrong GIF header written in GD GIFEncode)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreate(3, 3); // 3x3, 9 colors, 4 bits per pixel
diff --git a/ext/gd/tests/bug79676.phpt b/ext/gd/tests/bug79676.phpt
index 1187bfa1dfe63..c28a17b52b233 100644
--- a/ext/gd/tests/bug79676.phpt
+++ b/ext/gd/tests/bug79676.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #79676 (imagescale adds black border with IMG_BICUBIC)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 function test($image, $desc)
diff --git a/ext/gd/tests/colorat.phpt b/ext/gd/tests/colorat.phpt
index 9be5d431da941..d0e62aca91024 100644
--- a/ext/gd/tests/colorat.phpt
+++ b/ext/gd/tests/colorat.phpt
@@ -1,9 +1,7 @@
 --TEST--
 imagecolorat
---SKIPIF--
-<?php
-        if (!function_exists('imagecolorat')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $file = __DIR__ . '/im.wbmp';
diff --git a/ext/gd/tests/colorclosest.phpt b/ext/gd/tests/colorclosest.phpt
index 4c750d5150212..2633b24017d13 100644
--- a/ext/gd/tests/colorclosest.phpt
+++ b/ext/gd/tests/colorclosest.phpt
@@ -1,9 +1,7 @@
 --TEST--
 imageclosest
---SKIPIF--
-<?php
-        if (!function_exists('imagecolorclosest')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/colorexact.phpt b/ext/gd/tests/colorexact.phpt
index 41582492b0ce5..361701c77d364 100644
--- a/ext/gd/tests/colorexact.phpt
+++ b/ext/gd/tests/colorexact.phpt
@@ -1,9 +1,7 @@
 --TEST--
 imagecolorexact
---SKIPIF--
-<?php
-        if (!function_exists('imagecolorexact')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/colormatch.phpt b/ext/gd/tests/colormatch.phpt
index 7ddf2c87a184a..65b690ecd0153 100644
--- a/ext/gd/tests/colormatch.phpt
+++ b/ext/gd/tests/colormatch.phpt
@@ -1,9 +1,7 @@
 --TEST--
 imagecolormatch
---SKIPIF--
-<?php
-        if (!function_exists('imagecolormatch')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/colorresolve.phpt b/ext/gd/tests/colorresolve.phpt
index 6df57ef75d5c3..08daa4bb5f04a 100644
--- a/ext/gd/tests/colorresolve.phpt
+++ b/ext/gd/tests/colorresolve.phpt
@@ -1,9 +1,7 @@
 --TEST--
 imagecolorresolve
---SKIPIF--
-<?php
-        if (!function_exists('imagecolorresolve')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/copy.phpt b/ext/gd/tests/copy.phpt
index 046567e3ef345..5f099090e6611 100644
--- a/ext/gd/tests/copy.phpt
+++ b/ext/gd/tests/copy.phpt
@@ -1,9 +1,7 @@
 --TEST--
 imagecopy
---SKIPIF--
-<?php
-        if (!function_exists('imagecopy')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/copypalette.phpt b/ext/gd/tests/copypalette.phpt
index 747011e69a101..3965dbb8bc3e5 100644
--- a/ext/gd/tests/copypalette.phpt
+++ b/ext/gd/tests/copypalette.phpt
@@ -1,9 +1,7 @@
 --TEST--
 imagepalettecopy
---SKIPIF--
-<?php
-        if (!function_exists('imagecolorat')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $failed = false;
diff --git a/ext/gd/tests/copyresized.phpt b/ext/gd/tests/copyresized.phpt
index 2af9cc9682f44..da394fa076f02 100644
--- a/ext/gd/tests/copyresized.phpt
+++ b/ext/gd/tests/copyresized.phpt
@@ -1,9 +1,7 @@
 --TEST--
 imagecopyresized
---SKIPIF--
-<?php
-        if (!function_exists('imagecopyresized')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/crafted_gd2.phpt b/ext/gd/tests/crafted_gd2.phpt
index 1bf9895c1b6c9..773ce2f2e5557 100644
--- a/ext/gd/tests/crafted_gd2.phpt
+++ b/ext/gd/tests/crafted_gd2.phpt
@@ -1,11 +1,7 @@
 --TEST--
 Test max colors for a gd image.
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available\n");
-    }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 imagecreatefromgd(__DIR__ . '/crafted.gd2');
diff --git a/ext/gd/tests/createfromgd2.phpt b/ext/gd/tests/createfromgd2.phpt
index d6229d4f7ed50..93c63ad508975 100644
--- a/ext/gd/tests/createfromgd2.phpt
+++ b/ext/gd/tests/createfromgd2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 imagecreatefromgd2
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
         if (!function_exists('imagecreatefromgd2')) die("skip gd extension not available\n");
diff --git a/ext/gd/tests/createfromstring.phpt b/ext/gd/tests/createfromstring.phpt
index f3e40b26a9007..ce90b368f2e77 100644
--- a/ext/gd/tests/createfromstring.phpt
+++ b/ext/gd/tests/createfromstring.phpt
@@ -1,8 +1,9 @@
 --TEST--
 imagecreatefromstring
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-        if (!function_exists('imagecreatefromstring')) die("skip gd extension not available\n");
         if (!function_exists('imagepng')) die("skip no imagpng()\n");
 ?>
 --FILE--
diff --git a/ext/gd/tests/createfromwbmp-mb.phpt b/ext/gd/tests/createfromwbmp-mb.phpt
index f9dc9fe8bf253..5fef2820fd341 100644
--- a/ext/gd/tests/createfromwbmp-mb.phpt
+++ b/ext/gd/tests/createfromwbmp-mb.phpt
@@ -1,9 +1,7 @@
 --TEST--
 imagecreatefromwbmp
---SKIPIF--
-<?php
-        if (!function_exists('imagecreatefromwbmp')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $file = __DIR__ . '/src私はガラスを食べられます.wbmp';
diff --git a/ext/gd/tests/createfromwbmp.phpt b/ext/gd/tests/createfromwbmp.phpt
index d58188b80198e..b6016a7da491c 100644
--- a/ext/gd/tests/createfromwbmp.phpt
+++ b/ext/gd/tests/createfromwbmp.phpt
@@ -1,9 +1,7 @@
 --TEST--
 imagecreatefromwbmp
---SKIPIF--
-<?php
-        if (!function_exists('imagecreatefromwbmp')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $file = __DIR__ . '/src.wbmp';
diff --git a/ext/gd/tests/createfromwbmp2.phpt b/ext/gd/tests/createfromwbmp2.phpt
index 37f7cd48ff6c1..4608c861323f7 100644
--- a/ext/gd/tests/createfromwbmp2.phpt
+++ b/ext/gd/tests/createfromwbmp2.phpt
@@ -1,8 +1,9 @@
 --TEST--
 imagecreatefromwbmp with invalid wbmp
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!function_exists('imagecreatefromwbmp')) die("skip gd extension not available\n");
     if (!GD_BUNDLED) die("skip requires bundled GD library\n");
 ?>
 --FILE--
diff --git a/ext/gd/tests/createfromwbmp2_extern.phpt b/ext/gd/tests/createfromwbmp2_extern.phpt
index b426816f5b224..e3dfcfc7bbdfc 100644
--- a/ext/gd/tests/createfromwbmp2_extern.phpt
+++ b/ext/gd/tests/createfromwbmp2_extern.phpt
@@ -1,8 +1,9 @@
 --TEST--
 imagecreatefromwbmp with invalid wbmp
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!function_exists('imagecreatefromwbmp')) die("skip gd extension not available\n");
     if (GD_BUNDLED) die("skip requires extern GD\n");
 ?>
 --FILE--
diff --git a/ext/gd/tests/dashedlines.phpt b/ext/gd/tests/dashedlines.phpt
index bcf17174ccb12..11b2e83fad46a 100644
--- a/ext/gd/tests/dashedlines.phpt
+++ b/ext/gd/tests/dashedlines.phpt
@@ -1,9 +1,7 @@
 --TEST--
 imageline, dashed
---SKIPIF--
-<?php
-        if (!function_exists('imagecreatefromstring')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatetruecolor(6,6);
diff --git a/ext/gd/tests/gd_info_basic.phpt b/ext/gd/tests/gd_info_basic.phpt
index 61f73d97e7d95..dba8123edf8bb 100644
--- a/ext/gd/tests/gd_info_basic.phpt
+++ b/ext/gd/tests/gd_info_basic.phpt
@@ -1,11 +1,7 @@
 --TEST--
 gd_info()
---SKIPIF--
-<?php
-    if (!function_exists('gd_info')) {
-        die('skip gd_info() not available');
-    }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/gd_info_variation1.phpt b/ext/gd/tests/gd_info_variation1.phpt
index ec9ab1b34f5d7..89ff1613884cf 100644
--- a/ext/gd/tests/gd_info_variation1.phpt
+++ b/ext/gd/tests/gd_info_variation1.phpt
@@ -1,10 +1,9 @@
 --TEST--
 Test gd_info() function : variation - Checking all the values in returned array
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if(!extension_loaded('gd')) {
-    die('skip gd extension is not loaded');
-}
 if(!function_exists('gd_info')) {
     die('skip gd_info function is not available');
 }
diff --git a/ext/gd/tests/gdimage_prevent_cloning.phpt b/ext/gd/tests/gdimage_prevent_cloning.phpt
index 0f5c198e88b35..426f7d9c48f6c 100644
--- a/ext/gd/tests/gdimage_prevent_cloning.phpt
+++ b/ext/gd/tests/gdimage_prevent_cloning.phpt
@@ -1,11 +1,7 @@
 --TEST--
 Checks that GdImage instances cannot be cloned
---SKIPIF--
-<?php
-if(!extension_loaded('gd')) {
-    die('skip gd extension is not loaded');
-}
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/gdimage_prevent_serialization.phpt b/ext/gd/tests/gdimage_prevent_serialization.phpt
index e1e33127d1d3a..abe1829c523ea 100644
--- a/ext/gd/tests/gdimage_prevent_serialization.phpt
+++ b/ext/gd/tests/gdimage_prevent_serialization.phpt
@@ -1,11 +1,7 @@
 --TEST--
 GdImage instances must not be serialized
---SKIPIF--
-<?php
-if(!extension_loaded('gd')) {
-    die('skip gd extension is not loaded');
-}
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/gif.phpt b/ext/gd/tests/gif.phpt
index 75b8322715bb9..39f8d82d7760d 100644
--- a/ext/gd/tests/gif.phpt
+++ b/ext/gd/tests/gif.phpt
@@ -1,10 +1,9 @@
 --TEST--
 gif in/out
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available.");
-    }
     if (!function_exists("imagegif") || !function_exists("imagecreatefromgif") || !function_exists('imagecreatefromjpeg')) {
         die("skip gif support unavailable");
     }
diff --git a/ext/gd/tests/gif2gd.phpt b/ext/gd/tests/gif2gd.phpt
index 1d8a8278a1c41..79c0c87a47973 100644
--- a/ext/gd/tests/gif2gd.phpt
+++ b/ext/gd/tests/gif2gd.phpt
@@ -1,11 +1,9 @@
 --TEST--
 gif --> gd1/gd2 conversion test
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available.");
-    }
-
     if (!function_exists("imagecreatefromgif")) {
         die("skip gif read support unavailable");
     }
diff --git a/ext/gd/tests/gif2jpg.phpt b/ext/gd/tests/gif2jpg.phpt
index ba02bed00e155..3eeb699a6c51c 100644
--- a/ext/gd/tests/gif2jpg.phpt
+++ b/ext/gd/tests/gif2jpg.phpt
@@ -1,11 +1,9 @@
 --TEST--
 gif --> jpeg conversion test
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available.");
-    }
-
     if (!function_exists("imagejpeg")) {
         die("skip jpeg support unavailable");
     }
diff --git a/ext/gd/tests/gif2png.phpt b/ext/gd/tests/gif2png.phpt
index c051d73425788..1cac11ff17f10 100644
--- a/ext/gd/tests/gif2png.phpt
+++ b/ext/gd/tests/gif2png.phpt
@@ -1,11 +1,9 @@
 --TEST--
 gif --> png conversion test
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available.");
-    }
-
     if (!function_exists("imagepng")) {
         die("skip png support unavailable");
     }
diff --git a/ext/gd/tests/github_bug_215.phpt b/ext/gd/tests/github_bug_215.phpt
index 1426186971242..a7b62957d385f 100644
--- a/ext/gd/tests/github_bug_215.phpt
+++ b/ext/gd/tests/github_bug_215.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Github #215 (imagefilltoborder stack overflow when invalid pallete index used)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded("gd")) die("skip GD not present");
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
     die("skip test requires GD 2.2.2 or higher");
 }
diff --git a/ext/gd/tests/imageantialias_error2.phpt b/ext/gd/tests/imageantialias_error2.phpt
index 2b17b7825835d..40f4d64a12b6e 100644
--- a/ext/gd/tests/imageantialias_error2.phpt
+++ b/ext/gd/tests/imageantialias_error2.phpt
@@ -3,10 +3,8 @@ Testing wrong parameter passing in imageantialias() of GD library
 --CREDITS--
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 /*
diff --git a/ext/gd/tests/imagearc_basic.phpt b/ext/gd/tests/imagearc_basic.phpt
index 0e2ea3b514b32..be80f6c5f2317 100644
--- a/ext/gd/tests/imagearc_basic.phpt
+++ b/ext/gd/tests/imagearc_basic.phpt
@@ -3,10 +3,8 @@ Testing imagearc() of GD library
 --CREDITS--
 Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/imagearc_variation1.phpt b/ext/gd/tests/imagearc_variation1.phpt
index 3fb2a7d31c85f..89719aa60b494 100644
--- a/ext/gd/tests/imagearc_variation1.phpt
+++ b/ext/gd/tests/imagearc_variation1.phpt
@@ -3,10 +3,8 @@ Testing passing negative end angle to imagearc() of GD library
 --CREDITS--
 Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/imagearc_variation2.phpt b/ext/gd/tests/imagearc_variation2.phpt
index ad9addf7cdb90..4597cf3a8ff89 100644
--- a/ext/gd/tests/imagearc_variation2.phpt
+++ b/ext/gd/tests/imagearc_variation2.phpt
@@ -3,10 +3,8 @@ Testing passing negative start angle to imagearc() of GD library
 --CREDITS--
 Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/imagebmp_basic.phpt b/ext/gd/tests/imagebmp_basic.phpt
index 3493d48d60a23..a1eb244ef4e27 100644
--- a/ext/gd/tests/imagebmp_basic.phpt
+++ b/ext/gd/tests/imagebmp_basic.phpt
@@ -1,8 +1,9 @@
 --TEST--
 imagebmp() - basic functionality
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip ext/gd required');
 if (!(imagetypes() & IMG_BMP)) die('skip BMP support required');
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagebmp_nullbyte_injection.phpt b/ext/gd/tests/imagebmp_nullbyte_injection.phpt
index 979bf86bcae14..81a3e40d7c27f 100644
--- a/ext/gd/tests/imagebmp_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagebmp_nullbyte_injection.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Testing null byte injection in imagebmp
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if(!extension_loaded('gd')) die('skip gd extension not available');
 if (!gd_info()['BMP Support']) die('skip BMP support not available');
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagechar_basic.phpt b/ext/gd/tests/imagechar_basic.phpt
index 54b8c6df8ec49..3195eb82d4d4f 100644
--- a/ext/gd/tests/imagechar_basic.phpt
+++ b/ext/gd/tests/imagechar_basic.phpt
@@ -3,10 +3,8 @@ Testing imagechar() of GD library
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-    if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $image = imagecreatetruecolor(180, 30);
diff --git a/ext/gd/tests/imagecharup_basic.phpt b/ext/gd/tests/imagecharup_basic.phpt
index 15984eaf7fbcf..82bc18d6ad609 100644
--- a/ext/gd/tests/imagecharup_basic.phpt
+++ b/ext/gd/tests/imagecharup_basic.phpt
@@ -3,10 +3,8 @@ Testing imagecharup() of GD library
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-    if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $image = imagecreatetruecolor(180, 30);
diff --git a/ext/gd/tests/imagecolorallocate_basic.phpt b/ext/gd/tests/imagecolorallocate_basic.phpt
index 91cbd9ac25594..93cbd5ad54880 100644
--- a/ext/gd/tests/imagecolorallocate_basic.phpt
+++ b/ext/gd/tests/imagecolorallocate_basic.phpt
@@ -1,10 +1,9 @@
 --TEST--
 Test imagecolorallocate() function : basic functionality
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if(!extension_loaded('gd')) {
-    die('skip gd extension is not loaded');
-}
 if(!function_exists('imagecreatetruecolor')) {
     die('skip imagecreatetruecolor function is not available');
 }
diff --git a/ext/gd/tests/imagecolorallocate_variation5.phpt b/ext/gd/tests/imagecolorallocate_variation5.phpt
index bdddef96b06f3..853f5f660ba9d 100644
--- a/ext/gd/tests/imagecolorallocate_variation5.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation5.phpt
@@ -1,10 +1,9 @@
 --TEST--
 Test imagecolorallocate() function : usage variations  - passing octal and hexa-decimal values
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if(!extension_loaded('gd')) {
-    die('skip gd extension is not loaded');
-}
 if(!function_exists('imagecreatetruecolor')) {
     die('skip imagecreatetruecolor function is not available');
 }
diff --git a/ext/gd/tests/imagecolorallocate_variation6.phpt b/ext/gd/tests/imagecolorallocate_variation6.phpt
index bc9333cf37f3c..8c75bf2944ee1 100644
--- a/ext/gd/tests/imagecolorallocate_variation6.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation6.phpt
@@ -1,10 +1,9 @@
 --TEST--
 Test imagecolorallocate() function : usage variations  - passing RED, GREEN, BLUE values more than 255
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if(!extension_loaded('gd')) {
-    die('skip gd extension is not loaded');
-}
 if(!function_exists('imagecreatetruecolor')) {
     die('skip imagecreatetruecolor function is not available');
 }
diff --git a/ext/gd/tests/imagecolorallocatealpha_basic.phpt b/ext/gd/tests/imagecolorallocatealpha_basic.phpt
index d6e19b8eef6fa..cc02aaed0d8b3 100644
--- a/ext/gd/tests/imagecolorallocatealpha_basic.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_basic.phpt
@@ -2,9 +2,10 @@
 Testing imagecolorallocatealpha()
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded("gd")) die("skip GD not present");
     if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
         die("skip test requires GD 2.2.2 or higher");
     }
diff --git a/ext/gd/tests/imagecolorclosesthwb_basic_001.phpt b/ext/gd/tests/imagecolorclosesthwb_basic_001.phpt
index 09113bcda7904..c450ee6f4e483 100644
--- a/ext/gd/tests/imagecolorclosesthwb_basic_001.phpt
+++ b/ext/gd/tests/imagecolorclosesthwb_basic_001.phpt
@@ -1,11 +1,7 @@
 --TEST--
 Test imagecolorclosesthwb() basic functionality
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available.");
-    }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
     // Create the size of image or blank image
diff --git a/ext/gd/tests/imagecolordeallocate_basic.phpt b/ext/gd/tests/imagecolordeallocate_basic.phpt
index 6f8c3b7506392..dbbeaae6aa6ac 100644
--- a/ext/gd/tests/imagecolordeallocate_basic.phpt
+++ b/ext/gd/tests/imagecolordeallocate_basic.phpt
@@ -3,10 +3,8 @@ Testing imagecolordeallocate() of GD library
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-    if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $image = imagecreatetruecolor(180, 30);
diff --git a/ext/gd/tests/imagecolordeallocate_error3.phpt b/ext/gd/tests/imagecolordeallocate_error3.phpt
index 3fe8ad7f3da74..aa0110f8d21b7 100644
--- a/ext/gd/tests/imagecolordeallocate_error3.phpt
+++ b/ext/gd/tests/imagecolordeallocate_error3.phpt
@@ -3,10 +3,8 @@ Testing imagecolordeallocate() of GD library with Out of range integers (Above)
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-    if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 require_once __DIR__ . '/func.inc';
diff --git a/ext/gd/tests/imagecolordeallocate_error4.phpt b/ext/gd/tests/imagecolordeallocate_error4.phpt
index 3f94e172dce66..6cd7efc93b8b5 100644
--- a/ext/gd/tests/imagecolordeallocate_error4.phpt
+++ b/ext/gd/tests/imagecolordeallocate_error4.phpt
@@ -3,10 +3,8 @@ Testing imagecolordeallocate() of GD library with Out of range integers (Below)
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-    if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/imagecolormatch_basic.phpt b/ext/gd/tests/imagecolormatch_basic.phpt
index ff59e66b7b339..10c5fa3b48dd9 100644
--- a/ext/gd/tests/imagecolormatch_basic.phpt
+++ b/ext/gd/tests/imagecolormatch_basic.phpt
@@ -3,10 +3,8 @@ Basic test imagecolormatch() of GD library
 --CREDITS--
 Paulo Alves de Sousa Filho <pspalves [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $ima = imagecreatetruecolor(110, 20);
diff --git a/ext/gd/tests/imagecolormatch_error2.phpt b/ext/gd/tests/imagecolormatch_error2.phpt
index c9a75f7822bb4..5af039a785dd0 100644
--- a/ext/gd/tests/imagecolormatch_error2.phpt
+++ b/ext/gd/tests/imagecolormatch_error2.phpt
@@ -3,10 +3,8 @@ Send not TrueColor to Image 1 parameter imagecolormatch() of GD library
 --CREDITS--
 Paulo Alves de Sousa Filho <pspalves [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $ima = imagecreate(110, 20);
diff --git a/ext/gd/tests/imagecolormatch_error3.phpt b/ext/gd/tests/imagecolormatch_error3.phpt
index 25bc70c6a26e9..9b0d4c8830c7f 100644
--- a/ext/gd/tests/imagecolormatch_error3.phpt
+++ b/ext/gd/tests/imagecolormatch_error3.phpt
@@ -3,10 +3,8 @@ Send not TrueColor to Image 1 parameter imagecolormatch() of GD library
 --CREDITS--
 Paulo Alves de Sousa Filho <pspalves [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $ima = imagecreatetruecolor(110, 20);
diff --git a/ext/gd/tests/imagecolormatch_error4.phpt b/ext/gd/tests/imagecolormatch_error4.phpt
index b37d827cf3db2..e4aa04ca3d378 100644
--- a/ext/gd/tests/imagecolormatch_error4.phpt
+++ b/ext/gd/tests/imagecolormatch_error4.phpt
@@ -3,10 +3,8 @@ using different image sizes imagecolormatch() of GD library
 --CREDITS--
 Paulo Alves de Sousa Filho <pspalves [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $ima = imagecreatetruecolor(110, 20);
diff --git a/ext/gd/tests/imagecolorset_basic.phpt b/ext/gd/tests/imagecolorset_basic.phpt
index 3da518912808d..cb9b3683aa8ee 100644
--- a/ext/gd/tests/imagecolorset_basic.phpt
+++ b/ext/gd/tests/imagecolorset_basic.phpt
@@ -3,12 +3,8 @@ Test imagecolorset() function : basic functionality
 --CREDITS--
 Erick Belluci Tedeschi <erickbt86 [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) {
-    die('skip gd extension is not loaded');
-}
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 // Create a 300x100 image
diff --git a/ext/gd/tests/imagecolorstotal_basic.phpt b/ext/gd/tests/imagecolorstotal_basic.phpt
index 30adf26dae701..8f90b05e235ff 100644
--- a/ext/gd/tests/imagecolorstotal_basic.phpt
+++ b/ext/gd/tests/imagecolorstotal_basic.phpt
@@ -1,11 +1,9 @@
 --TEST--
 Test imagecolorstotal() function : basic functionality
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if(!extension_loaded('gd')) {
-    die('skip gd extension is not loaded');
-}
-
 if(!function_exists('imagecolorstotal') || !function_exists('imagecreatefromgif')) {
     die('skip imagecolorstotal and imagecreatefromgif functions not available in this build');
 }
diff --git a/ext/gd/tests/imagecolourstotal_basic.phpt b/ext/gd/tests/imagecolourstotal_basic.phpt
index 0d03ecf7586f6..0c9fd763247b2 100644
--- a/ext/gd/tests/imagecolourstotal_basic.phpt
+++ b/ext/gd/tests/imagecolourstotal_basic.phpt
@@ -2,11 +2,10 @@
 Test imagecolorstotal() function : basic functionality
 --CREDITS--
 Felix De Vliegher <felix.devliegher@gmail.com>
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available.");
-    }
     if (!function_exists("imagecolorstotal")) {
         die("skip imagecolorstotal() not available.");
     }
diff --git a/ext/gd/tests/imageconvolution_basic.phpt b/ext/gd/tests/imageconvolution_basic.phpt
index be6ff52eaa2eb..aa8347884999a 100644
--- a/ext/gd/tests/imageconvolution_basic.phpt
+++ b/ext/gd/tests/imageconvolution_basic.phpt
@@ -3,10 +3,8 @@ Testing imageconvolution() of GD library
 --CREDITS--
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $image = imagecreatetruecolor(180, 30);
diff --git a/ext/gd/tests/imageconvolution_error2.phpt b/ext/gd/tests/imageconvolution_error2.phpt
index 32c2618aaf87d..dccb82f0e7db6 100644
--- a/ext/gd/tests/imageconvolution_error2.phpt
+++ b/ext/gd/tests/imageconvolution_error2.phpt
@@ -3,10 +3,8 @@ Testing wrong array size 2x3 in imageconvolution() of GD library
 --CREDITS--
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 require __DIR__ . '/func.inc';
diff --git a/ext/gd/tests/imageconvolution_error3.phpt b/ext/gd/tests/imageconvolution_error3.phpt
index 000c0912f54cb..8137f3d194821 100644
--- a/ext/gd/tests/imageconvolution_error3.phpt
+++ b/ext/gd/tests/imageconvolution_error3.phpt
@@ -3,10 +3,8 @@ Testing wrong array size 3x2 in imageconvolution() of GD library
 --CREDITS--
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 require __DIR__ . '/func.inc';
diff --git a/ext/gd/tests/imagecopymerge_basic.phpt b/ext/gd/tests/imagecopymerge_basic.phpt
index d533209f6dd3b..b40e2d63cdb2f 100644
--- a/ext/gd/tests/imagecopymerge_basic.phpt
+++ b/ext/gd/tests/imagecopymerge_basic.phpt
@@ -6,10 +6,8 @@ Cleston Viel Vieira de Sousa <cleston [dot] vs [at] gmail [dot] com>
 
 Updated by Sean Fraaser <frasmage [at] gmail [dot] com>
 PHP[tek] 2017
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/imagecopymergegray_basic.phpt b/ext/gd/tests/imagecopymergegray_basic.phpt
index a4e587123f0f7..d0213c7aba724 100644
--- a/ext/gd/tests/imagecopymergegray_basic.phpt
+++ b/ext/gd/tests/imagecopymergegray_basic.phpt
@@ -3,10 +3,8 @@ Testing imagecopymergegray() of GD library
 --CREDITS--
 Sean Fraser <frasmage [at] gmail [dot] com>
 PHP[tek] 2017
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/imagecopyresampled_basic.phpt b/ext/gd/tests/imagecopyresampled_basic.phpt
index 1d6012e3f96e7..a3200b3537809 100644
--- a/ext/gd/tests/imagecopyresampled_basic.phpt
+++ b/ext/gd/tests/imagecopyresampled_basic.phpt
@@ -1,9 +1,7 @@
 --TEST--
 imagecopyresampled()
---SKIPIF--
-<?php
-    if (!function_exists('imagecopyresampled')) die('skip imagecopyresampled() not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/imagecopyresampled_variation1.phpt b/ext/gd/tests/imagecopyresampled_variation1.phpt
index 98547f8931f98..207344765565f 100644
--- a/ext/gd/tests/imagecopyresampled_variation1.phpt
+++ b/ext/gd/tests/imagecopyresampled_variation1.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Test for correct colors of imagecopyresampled() wrt. alpha
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip ext/gd required');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/imagecreate_error.phpt b/ext/gd/tests/imagecreate_error.phpt
index 1e068205e95b0..c6a9385468741 100644
--- a/ext/gd/tests/imagecreate_error.phpt
+++ b/ext/gd/tests/imagecreate_error.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Testing imagecreate(): error on out of bound parameters
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded("gd")) die("skip GD not present");
     if (!function_exists("imagecreate")) die("skip GD Version not compatible");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecreatefrombmp_basic.phpt b/ext/gd/tests/imagecreatefrombmp_basic.phpt
index 9cf6bd2ca3077..51eb22c71adf0 100644
--- a/ext/gd/tests/imagecreatefrombmp_basic.phpt
+++ b/ext/gd/tests/imagecreatefrombmp_basic.phpt
@@ -1,8 +1,9 @@
 --TEST--
 imagecreatefrombmp() - basic functionality
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip ext/gd required');
 if (!(imagetypes() & IMG_BMP)) die('skip BMP support required');
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecreatefromstring_bmp.phpt b/ext/gd/tests/imagecreatefromstring_bmp.phpt
index 14d7aabeded6e..8f9e1dd675b91 100644
--- a/ext/gd/tests/imagecreatefromstring_bmp.phpt
+++ b/ext/gd/tests/imagecreatefromstring_bmp.phpt
@@ -1,8 +1,9 @@
 --TEST--
 imagecreatefromstring() - BMP format
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip ext/gd required');
 if (!(imagetypes() & IMG_BMP)) die('skip BMP support required');
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecreatefromstring_gif.phpt b/ext/gd/tests/imagecreatefromstring_gif.phpt
index 66f91c1aff2a9..cfd8d3ef4f09c 100644
--- a/ext/gd/tests/imagecreatefromstring_gif.phpt
+++ b/ext/gd/tests/imagecreatefromstring_gif.phpt
@@ -1,8 +1,9 @@
 --TEST--
 imagecreatefromstring() - GIF format
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip ext/gd required');
 if (!(imagetypes() & IMG_GIF)) die('skip GIF support required');
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecreatefromstring_png.phpt b/ext/gd/tests/imagecreatefromstring_png.phpt
index b76f1a181a6eb..f1918506813b2 100644
--- a/ext/gd/tests/imagecreatefromstring_png.phpt
+++ b/ext/gd/tests/imagecreatefromstring_png.phpt
@@ -1,8 +1,9 @@
 --TEST--
 imagecreatefromstring() - PNG format
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip ext/gd required');
 if (!(imagetypes() & IMG_PNG)) die('skip PNG support required');
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecreatefromstring_webp.phpt b/ext/gd/tests/imagecreatefromstring_webp.phpt
index e60be0499a7dc..83c2b034872fe 100644
--- a/ext/gd/tests/imagecreatefromstring_webp.phpt
+++ b/ext/gd/tests/imagecreatefromstring_webp.phpt
@@ -1,8 +1,9 @@
 --TEST--
 imagecreatefromstring() - WEBP format
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip ext/gd required');
 if (!(imagetypes() & IMG_WEBP)) die('skip WEBP support required');
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecreatefromtga_basic.phpt b/ext/gd/tests/imagecreatefromtga_basic.phpt
index 3025e522d53e7..25f034878b0c6 100644
--- a/ext/gd/tests/imagecreatefromtga_basic.phpt
+++ b/ext/gd/tests/imagecreatefromtga_basic.phpt
@@ -1,8 +1,9 @@
 --TEST--
 imagecreatefromtga() - basic functionality
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip ext/gd required');
 if (!(imagetypes() & IMG_TGA)) die('skip TGA support required');
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecreatefromtga_variation.phpt b/ext/gd/tests/imagecreatefromtga_variation.phpt
index 39dd4b0b59876..0948f978f2f6a 100644
--- a/ext/gd/tests/imagecreatefromtga_variation.phpt
+++ b/ext/gd/tests/imagecreatefromtga_variation.phpt
@@ -1,8 +1,9 @@
 --TEST--
 imagecreatefromtga() - RLE file reading
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip ext/gd required');
 if (!(imagetypes() & IMG_TGA)) die('skip TGA support required');
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecreatetruecolor_basic.phpt b/ext/gd/tests/imagecreatetruecolor_basic.phpt
index bb29eb6b1cb25..5af8a0a1a32bc 100644
--- a/ext/gd/tests/imagecreatetruecolor_basic.phpt
+++ b/ext/gd/tests/imagecreatetruecolor_basic.phpt
@@ -2,9 +2,10 @@
 Testing imagecreatetruecolor() of GD library
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded("gd")) die("skip GD not present");
     if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecreatetruecolor_error2.phpt b/ext/gd/tests/imagecreatetruecolor_error2.phpt
index d0e4933e7aeb2..0d299d3c11bb4 100644
--- a/ext/gd/tests/imagecreatetruecolor_error2.phpt
+++ b/ext/gd/tests/imagecreatetruecolor_error2.phpt
@@ -2,9 +2,10 @@
 Testing imagecreatetruecolor(): error on out of bound parameters
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded("gd")) die("skip GD not present");
     if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecrop_auto.phpt b/ext/gd/tests/imagecrop_auto.phpt
index 97cac3da01dee..5d3d50b3ef317 100644
--- a/ext/gd/tests/imagecrop_auto.phpt
+++ b/ext/gd/tests/imagecrop_auto.phpt
@@ -1,8 +1,10 @@
 --TEST--
 Testing imagecropauto()
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if ( ! extension_loaded('gd') || !function_exists('imagecrop')) die( 'skip GD imagecropauto not present; skipping test' );
+if (!function_exists('imagecrop')) die( 'skip GD imagecropauto not present; skipping test' );
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagedashedline_basic.phpt b/ext/gd/tests/imagedashedline_basic.phpt
index 28ad43c7068bd..b36ffbfc6f593 100644
--- a/ext/gd/tests/imagedashedline_basic.phpt
+++ b/ext/gd/tests/imagedashedline_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 imagedashedline()
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
     if (!function_exists('imagedashedline')) die('skip imagedashedline() not available');
diff --git a/ext/gd/tests/imageellipse_basic.phpt b/ext/gd/tests/imageellipse_basic.phpt
index 9f0cf977bbccb..0c86e7cfcb859 100644
--- a/ext/gd/tests/imageellipse_basic.phpt
+++ b/ext/gd/tests/imageellipse_basic.phpt
@@ -3,10 +3,8 @@ Testing imageellipse() of GD library
 --CREDITS--
 Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/imagefill_1.phpt b/ext/gd/tests/imagefill_1.phpt
index ea2129b52b0ef..d8631f73cc42a 100644
--- a/ext/gd/tests/imagefill_1.phpt
+++ b/ext/gd/tests/imagefill_1.phpt
@@ -1,10 +1,9 @@
 --TEST--
 imagefill() infinite loop with wrong color index
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available.");
-    }
     if (!function_exists("imagefttext")) {
         die("skip imagefttext() not available.");
     }
diff --git a/ext/gd/tests/imagefilledarc_basic.phpt b/ext/gd/tests/imagefilledarc_basic.phpt
index 199d435d9dd1a..f3b8c7ac8e89e 100644
--- a/ext/gd/tests/imagefilledarc_basic.phpt
+++ b/ext/gd/tests/imagefilledarc_basic.phpt
@@ -3,9 +3,10 @@ Testing imagefilledarc() of GD library
 --CREDITS--
 Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded("gd")) die("skip GD not present");
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
     die("skip test requires GD 2.2.2 or higher");
 }
diff --git a/ext/gd/tests/imagefilledarc_variation1.phpt b/ext/gd/tests/imagefilledarc_variation1.phpt
index f17651afef249..d25d2afc87987 100644
--- a/ext/gd/tests/imagefilledarc_variation1.phpt
+++ b/ext/gd/tests/imagefilledarc_variation1.phpt
@@ -3,9 +3,10 @@ Testing passing negative end angle to imagefilledarc() of GD library
 --CREDITS--
 Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded("gd")) die("skip GD not present");
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
     die("skip test requires GD 2.2.2 or higher");
 }
diff --git a/ext/gd/tests/imagefilledarc_variation2.phpt b/ext/gd/tests/imagefilledarc_variation2.phpt
index b388882390983..fb4675ec5dd69 100644
--- a/ext/gd/tests/imagefilledarc_variation2.phpt
+++ b/ext/gd/tests/imagefilledarc_variation2.phpt
@@ -3,9 +3,10 @@ Testing passing negative start angle to imagefilledarc() of GD library
 --CREDITS--
 Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded("gd")) die("skip GD not present");
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
     die("skip test requires GD 2.2.2 or higher");
 }
diff --git a/ext/gd/tests/imagefilledellipse_basic.phpt b/ext/gd/tests/imagefilledellipse_basic.phpt
index ef492510af0db..19a94b1200e24 100644
--- a/ext/gd/tests/imagefilledellipse_basic.phpt
+++ b/ext/gd/tests/imagefilledellipse_basic.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Testing imagefilledellipse() of GD library
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/imagefilledpolygon_basic.phpt b/ext/gd/tests/imagefilledpolygon_basic.phpt
index 6462f42de736e..6cba5238d3246 100644
--- a/ext/gd/tests/imagefilledpolygon_basic.phpt
+++ b/ext/gd/tests/imagefilledpolygon_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 imagefilledpolygon()
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
     if (!function_exists('imagefilledpolygon')) die('skip imagefilledpolygon() not available');
diff --git a/ext/gd/tests/imagefilltoborder_basic.phpt b/ext/gd/tests/imagefilltoborder_basic.phpt
index e177918e3eaa5..7e79ea47b46b6 100644
--- a/ext/gd/tests/imagefilltoborder_basic.phpt
+++ b/ext/gd/tests/imagefilltoborder_basic.phpt
@@ -3,10 +3,8 @@ Testing imagefilltoborder() of GD library
 --CREDITS--
 Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-30
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 // Create a image
diff --git a/ext/gd/tests/imagefilter.phpt b/ext/gd/tests/imagefilter.phpt
index a55b88ee90384..98e8e3e1773db 100644
--- a/ext/gd/tests/imagefilter.phpt
+++ b/ext/gd/tests/imagefilter.phpt
@@ -1,10 +1,9 @@
 --TEST--
 imagefilter() function test
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available.");
-    }
     if (!function_exists("imagefilter")) die("skip requires bundled GD library\n");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefilter_error1.phpt b/ext/gd/tests/imagefilter_error1.phpt
index 407944d899fb1..6e2ccabb874a8 100644
--- a/ext/gd/tests/imagefilter_error1.phpt
+++ b/ext/gd/tests/imagefilter_error1.phpt
@@ -3,10 +3,8 @@ Testing wrong parameter passing in imagefilter() of GD library
 --CREDITS--
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $image = imagecreatetruecolor(180, 30);
diff --git a/ext/gd/tests/imagefilter_error13.phpt b/ext/gd/tests/imagefilter_error13.phpt
index fb17ccc97e467..94feca3cebdd4 100644
--- a/ext/gd/tests/imagefilter_error13.phpt
+++ b/ext/gd/tests/imagefilter_error13.phpt
@@ -3,10 +3,8 @@ Testing wrong parameter value of COLORIZE in imagefilter() of GD library
 --CREDITS--
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $image = imagecreatetruecolor(180, 30);
diff --git a/ext/gd/tests/imageflip.phpt b/ext/gd/tests/imageflip.phpt
index 7f0d2f366ac2d..a67ecbce2ac5b 100644
--- a/ext/gd/tests/imageflip.phpt
+++ b/ext/gd/tests/imageflip.phpt
@@ -1,8 +1,10 @@
 --TEST--
 Testing imageflip() of GD library
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if ( ! extension_loaded('gd') || !function_exists('imageflip')) die( 'skip GD not present; skipping test' );
+if (!function_exists('imageflip')) die( 'skip GD not present; skipping test' );
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagefontheight_basic.phpt b/ext/gd/tests/imagefontheight_basic.phpt
index 65d6ec15bbe02..34921e20fc56c 100644
--- a/ext/gd/tests/imagefontheight_basic.phpt
+++ b/ext/gd/tests/imagefontheight_basic.phpt
@@ -3,10 +3,8 @@ Testing imagefontheight() of GD library
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-    if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 var_dump(imagefontheight(1),imagefontheight(2),imagefontheight(3),imagefontheight(4),imagefontheight(5));
diff --git a/ext/gd/tests/imagefontwidth_basic.phpt b/ext/gd/tests/imagefontwidth_basic.phpt
index 87eac74133718..70dfbcdc4177c 100644
--- a/ext/gd/tests/imagefontwidth_basic.phpt
+++ b/ext/gd/tests/imagefontwidth_basic.phpt
@@ -3,10 +3,8 @@ Testing imagefontwidth() of GD library
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-    if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 var_dump(imagefontwidth(1),imagefontwidth(2),imagefontwidth(3),imagefontwidth(4),imagefontwidth(5));
diff --git a/ext/gd/tests/imagefttext.phpt b/ext/gd/tests/imagefttext.phpt
index 52ed27aadbf22..a60c4d8afbae6 100644
--- a/ext/gd/tests/imagefttext.phpt
+++ b/ext/gd/tests/imagefttext.phpt
@@ -1,10 +1,9 @@
 --TEST--
 imagefttext() function test
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available.");
-    }
     if (!function_exists("imagefttext")) {
         die("skip imagefttext() not available.");
     }
diff --git a/ext/gd/tests/imagegammacorrect_basic.phpt b/ext/gd/tests/imagegammacorrect_basic.phpt
index 449363f8e68f0..67b2a36a1657a 100644
--- a/ext/gd/tests/imagegammacorrect_basic.phpt
+++ b/ext/gd/tests/imagegammacorrect_basic.phpt
@@ -3,9 +3,10 @@ Testing imagegammacorrect() of GD library
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded("gd")) die("skip GD not present");
     if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
         die("skip test requires GD 2.2.2 or higher");
     }
diff --git a/ext/gd/tests/imagegammacorrect_variation1.phpt b/ext/gd/tests/imagegammacorrect_variation1.phpt
index 81b3ac7d46ee3..1c41a257b9ec4 100644
--- a/ext/gd/tests/imagegammacorrect_variation1.phpt
+++ b/ext/gd/tests/imagegammacorrect_variation1.phpt
@@ -3,9 +3,10 @@ Testing imagegammacorrect() of GD library with non TrueColor image
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded("gd")) die("skip GD not present");
     if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
         die("skip test requires GD 2.2.2 or higher");
     }
diff --git a/ext/gd/tests/imagegammacorrect_variation2.phpt b/ext/gd/tests/imagegammacorrect_variation2.phpt
index 908be81d42999..c75c728296bec 100644
--- a/ext/gd/tests/imagegammacorrect_variation2.phpt
+++ b/ext/gd/tests/imagegammacorrect_variation2.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Apply imagegammacorrect() to a step wedge
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 require __DIR__ . DIRECTORY_SEPARATOR . 'func.inc';
diff --git a/ext/gd/tests/imagegd2_nullbyte_injection.phpt b/ext/gd/tests/imagegd2_nullbyte_injection.phpt
index 6daabbb199ae8..5765543be1df3 100644
--- a/ext/gd/tests/imagegd2_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagegd2_nullbyte_injection.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Testing null byte injection in imagegd2
---SKIPIF--
-<?php
-        if(!extension_loaded('gd')){ die('skip gd extension not available'); }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $image = imagecreate(1,1);// 1px image
diff --git a/ext/gd/tests/imagegd_nullbyte_injection.phpt b/ext/gd/tests/imagegd_nullbyte_injection.phpt
index 0560152c95aea..657e11dd17882 100644
--- a/ext/gd/tests/imagegd_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagegd_nullbyte_injection.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Testing null byte injection in imagegd
---SKIPIF--
-<?php
-        if(!extension_loaded('gd')){ die('skip gd extension not available'); }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $image = imagecreate(1,1);// 1px image
diff --git a/ext/gd/tests/imagegd_truecolor.phpt b/ext/gd/tests/imagegd_truecolor.phpt
index 5c03f6994b9bd..d207485b5271a 100644
--- a/ext/gd/tests/imagegd_truecolor.phpt
+++ b/ext/gd/tests/imagegd_truecolor.phpt
@@ -1,9 +1,7 @@
 --TEST--
 imagegd() writes truecolor images without palette conversion
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'func.inc';
diff --git a/ext/gd/tests/imagegetclip_basic.phpt b/ext/gd/tests/imagegetclip_basic.phpt
index 864304038a723..1e8d6d45beb9b 100644
--- a/ext/gd/tests/imagegetclip_basic.phpt
+++ b/ext/gd/tests/imagegetclip_basic.phpt
@@ -1,9 +1,7 @@
 --TEST--
 imagegetclip() - basic functionality
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip ext/gd required');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreate(10, 10);
diff --git a/ext/gd/tests/imagegif_nullbyte_injection.phpt b/ext/gd/tests/imagegif_nullbyte_injection.phpt
index 459078865a34b..5cdb6f6879f8f 100644
--- a/ext/gd/tests/imagegif_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagegif_nullbyte_injection.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Testing null byte injection in imagegif
---SKIPIF--
-<?php
-if(!extension_loaded('gd')){ die('skip gd extension not available'); }
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $image = imagecreate(1,1);// 1px image
diff --git a/ext/gd/tests/imageinterlace_basic.phpt b/ext/gd/tests/imageinterlace_basic.phpt
index 5ea674e60619e..52b29f9f64845 100644
--- a/ext/gd/tests/imageinterlace_basic.phpt
+++ b/ext/gd/tests/imageinterlace_basic.phpt
@@ -3,10 +3,8 @@ Testing imageinterlace() of GD library
 --CREDITS--
 Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/imageinterlace_variation1.phpt b/ext/gd/tests/imageinterlace_variation1.phpt
index 477aa9d259a1a..839089c9ec14f 100644
--- a/ext/gd/tests/imageinterlace_variation1.phpt
+++ b/ext/gd/tests/imageinterlace_variation1.phpt
@@ -3,10 +3,8 @@ Testing setting the interlace bit on with imageinterlace() of GD library
 --CREDITS--
 Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/imageinterlace_variation2.phpt b/ext/gd/tests/imageinterlace_variation2.phpt
index 37370cec03ebd..06c35bc7942c4 100644
--- a/ext/gd/tests/imageinterlace_variation2.phpt
+++ b/ext/gd/tests/imageinterlace_variation2.phpt
@@ -3,10 +3,8 @@ Testing setting the interlace bit off with imageinterlace() of GD library
 --CREDITS--
 Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/imageinterpolation_basic.phpt b/ext/gd/tests/imageinterpolation_basic.phpt
index 4f01f9b0f2ef9..9f004af0ca374 100644
--- a/ext/gd/tests/imageinterpolation_basic.phpt
+++ b/ext/gd/tests/imageinterpolation_basic.phpt
@@ -1,9 +1,7 @@
 --TEST--
 imagegetinterpolation() and imagesetinterpolation() basic test
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $methods = array(
diff --git a/ext/gd/tests/imageistruecolor_basic.phpt b/ext/gd/tests/imageistruecolor_basic.phpt
index 971a9dc3b8f68..dee0c808cb7f2 100644
--- a/ext/gd/tests/imageistruecolor_basic.phpt
+++ b/ext/gd/tests/imageistruecolor_basic.phpt
@@ -2,9 +2,10 @@
 Testing imageistruecolor() of GD library
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded("gd")) die("skip GD not present");
     if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagejpeg_nullbyte_injection.phpt b/ext/gd/tests/imagejpeg_nullbyte_injection.phpt
index 0473712274fbd..6863626a0c939 100644
--- a/ext/gd/tests/imagejpeg_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagejpeg_nullbyte_injection.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Testing null byte injection in imagejpeg
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if(!extension_loaded('gd')){ die('skip gd extension not available'); }
 $support = gd_info();
 if (!isset($support['JPEG Support']) || $support['JPEG Support'] === false) {
     print 'skip jpeg support not available';
diff --git a/ext/gd/tests/imagelayereffect_basic.phpt b/ext/gd/tests/imagelayereffect_basic.phpt
index dc41148394b00..2480110669c62 100644
--- a/ext/gd/tests/imagelayereffect_basic.phpt
+++ b/ext/gd/tests/imagelayereffect_basic.phpt
@@ -3,9 +3,10 @@ Testing imagelayereffect() of GD library
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded("gd")) die("skip GD not present");
     if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected');
 ?>
 --FILE--
diff --git a/ext/gd/tests/imageloadfont_end_of_file_while_reading_header.phpt b/ext/gd/tests/imageloadfont_end_of_file_while_reading_header.phpt
index 18f806d5b004f..e033fa42451fd 100644
--- a/ext/gd/tests/imageloadfont_end_of_file_while_reading_header.phpt
+++ b/ext/gd/tests/imageloadfont_end_of_file_while_reading_header.phpt
@@ -3,10 +3,8 @@ imageloadfont() "End of file while reading header"
 --CREDITS--
 Ike Devolder <ike.devolder@gmail.com>
 User Group: PHP-WVL & PHPGent #PHPTestFest
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $filename = __DIR__ .  '/font.gdf';
diff --git a/ext/gd/tests/imageloadfont_error2.phpt b/ext/gd/tests/imageloadfont_error2.phpt
index 6d30c1de337b7..76984876801b3 100644
--- a/ext/gd/tests/imageloadfont_error2.phpt
+++ b/ext/gd/tests/imageloadfont_error2.phpt
@@ -2,10 +2,8 @@
 Testing that imageloadfont() breaks on invalid file passed as first argument
 --CREDITS--
 Austin Drouare <austin.drouare [at] gmail [dot] com> #testfest #tek11
---SKIPIF--
-<?php
-    if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 var_dump( imageloadfont('\src\invalidfile.font') );
diff --git a/ext/gd/tests/imageloadfont_invalid.phpt b/ext/gd/tests/imageloadfont_invalid.phpt
index 7bf326160c0c8..05d89a832254a 100644
--- a/ext/gd/tests/imageloadfont_invalid.phpt
+++ b/ext/gd/tests/imageloadfont_invalid.phpt
@@ -1,9 +1,7 @@
 --TEST--
 imageloadfont() function crashes
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $filename = __DIR__ .  '/font.gdf';
diff --git a/ext/gd/tests/imageopenpolygon_basic.phpt b/ext/gd/tests/imageopenpolygon_basic.phpt
index d25dc99c16227..6ed6d63a5ac47 100644
--- a/ext/gd/tests/imageopenpolygon_basic.phpt
+++ b/ext/gd/tests/imageopenpolygon_basic.phpt
@@ -1,9 +1,7 @@
 --TEST--
 imageopenpolygon(): basic test
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'func.inc';
diff --git a/ext/gd/tests/imagepalettetotruecolor_basic.phpt b/ext/gd/tests/imagepalettetotruecolor_basic.phpt
index 4c4a261b92b41..e4e4ee89ca1d3 100644
--- a/ext/gd/tests/imagepalettetotruecolor_basic.phpt
+++ b/ext/gd/tests/imagepalettetotruecolor_basic.phpt
@@ -2,10 +2,8 @@
 does the imagepalettetotruecollor function really converts the image palette?
 --CREDITS--
 Carlos André Ferrari <caferrari [at] gmail [dot] com>
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) die("skip gd extension not available.");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreate(100, 100);
diff --git a/ext/gd/tests/imagepng_nullbyte_injection.phpt b/ext/gd/tests/imagepng_nullbyte_injection.phpt
index 6ef99e67a27e2..f5ec342b9c6ec 100644
--- a/ext/gd/tests/imagepng_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagepng_nullbyte_injection.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Testing null byte injection in imagepng
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if(!extension_loaded('gd')){ die('skip gd extension not available'); }
 $support = gd_info();
 if (!isset($support['PNG Support']) || $support['PNG Support'] === false) {
     print 'skip png support not available';
diff --git a/ext/gd/tests/imagepolygon_aa.phpt b/ext/gd/tests/imagepolygon_aa.phpt
index 97d607d9c4999..77fef3beed9a5 100644
--- a/ext/gd/tests/imagepolygon_aa.phpt
+++ b/ext/gd/tests/imagepolygon_aa.phpt
@@ -1,9 +1,7 @@
 --TEST--
 antialiased imagepolygon()
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'func.inc';
diff --git a/ext/gd/tests/imagepolygon_basic.phpt b/ext/gd/tests/imagepolygon_basic.phpt
index bea4462c6a160..4d17b30eacfa9 100644
--- a/ext/gd/tests/imagepolygon_basic.phpt
+++ b/ext/gd/tests/imagepolygon_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 imagepolygon()
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
     if (!function_exists('imagepolygon')) die('skip imagepolygon() not available');
diff --git a/ext/gd/tests/imagerectangle_basic.phpt b/ext/gd/tests/imagerectangle_basic.phpt
index 462ff583375eb..d71c44156f98c 100644
--- a/ext/gd/tests/imagerectangle_basic.phpt
+++ b/ext/gd/tests/imagerectangle_basic.phpt
@@ -3,10 +3,8 @@ Testing imagerectangle() of GD library
 --CREDITS--
 Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-30
---SKIPIF--
-<?php
-if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 // Create a image
diff --git a/ext/gd/tests/imageresolution_jpeg.phpt b/ext/gd/tests/imageresolution_jpeg.phpt
index 73b76c1f9d7c1..cc1977e332f56 100644
--- a/ext/gd/tests/imageresolution_jpeg.phpt
+++ b/ext/gd/tests/imageresolution_jpeg.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Set and get image resolution of JPEG images
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
 if (!(imagetypes() & IMG_JPEG)) die('skip JPEG support not available');
 ?>
 --FILE--
diff --git a/ext/gd/tests/imageresolution_png.phpt b/ext/gd/tests/imageresolution_png.phpt
index 5ff3d8ae9e876..a72f351a156bf 100644
--- a/ext/gd/tests/imageresolution_png.phpt
+++ b/ext/gd/tests/imageresolution_png.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Set and get image resolution of PNG images
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $filename = __DIR__ . DIRECTORY_SEPARATOR . 'imageresolution_png.png';
diff --git a/ext/gd/tests/imagerotate_overflow.phpt b/ext/gd/tests/imagerotate_overflow.phpt
index 34d66862ea5bf..29cc89c1c56eb 100644
--- a/ext/gd/tests/imagerotate_overflow.phpt
+++ b/ext/gd/tests/imagerotate_overflow.phpt
@@ -1,11 +1,9 @@
 --TEST--
 imagerotate() overflow with negative numbers
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available.");
-    }
-
     if (!function_exists('imagerotate')) {
         die("skip imagerotate() not available.");
     }
diff --git a/ext/gd/tests/imagescale_preserve_ratio.phpt b/ext/gd/tests/imagescale_preserve_ratio.phpt
index 00076e431e5d7..7024ce2d42baa 100644
--- a/ext/gd/tests/imagescale_preserve_ratio.phpt
+++ b/ext/gd/tests/imagescale_preserve_ratio.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Scale images and preserve aspect ratio
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/imagesetbrush_basic.phpt b/ext/gd/tests/imagesetbrush_basic.phpt
index ae6a52a28ed16..be8a3d33e4ad7 100644
--- a/ext/gd/tests/imagesetbrush_basic.phpt
+++ b/ext/gd/tests/imagesetbrush_basic.phpt
@@ -3,12 +3,8 @@ Test imagesetbrush() function : basic functionality
 --CREDITS--
 Erick Belluci Tedeschi <erickbt86 [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) {
-    die('skip gd extension is not loaded');
-}
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 // Create the brush image
diff --git a/ext/gd/tests/imagesetclip_basic.phpt b/ext/gd/tests/imagesetclip_basic.phpt
index 6cf2ef2beb0e4..33435bd380a7a 100644
--- a/ext/gd/tests/imagesetclip_basic.phpt
+++ b/ext/gd/tests/imagesetclip_basic.phpt
@@ -1,9 +1,7 @@
 --TEST--
 imagesetclip() - basic functionality
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip ext/gd required');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 // draw a clipped diagonal line
diff --git a/ext/gd/tests/imagesetthickness_basic.phpt b/ext/gd/tests/imagesetthickness_basic.phpt
index 30bd6094aa083..88f7803dcf610 100644
--- a/ext/gd/tests/imagesetthickness_basic.phpt
+++ b/ext/gd/tests/imagesetthickness_basic.phpt
@@ -2,9 +2,10 @@
 Testing imagetruecolortopalette() of GD library
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded("gd")) die("skip GD not present");
     if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagestring_basic.phpt b/ext/gd/tests/imagestring_basic.phpt
index 0e418a69dd0b5..1a71ba173c820 100644
--- a/ext/gd/tests/imagestring_basic.phpt
+++ b/ext/gd/tests/imagestring_basic.phpt
@@ -3,10 +3,8 @@ Testing imagestring() of GD library
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-    if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $image = imagecreatetruecolor(180, 30);
diff --git a/ext/gd/tests/imagestringup_basic.phpt b/ext/gd/tests/imagestringup_basic.phpt
index 93ea4f34ea2a5..85b85e1e31c51 100644
--- a/ext/gd/tests/imagestringup_basic.phpt
+++ b/ext/gd/tests/imagestringup_basic.phpt
@@ -3,10 +3,8 @@ Testing imagestringup() of GD library
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
---SKIPIF--
-<?php
-    if (!extension_loaded("gd")) die("skip GD not present");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $image = imagecreatetruecolor(180, 30);
diff --git a/ext/gd/tests/imagetruecolortopalette_basic.phpt b/ext/gd/tests/imagetruecolortopalette_basic.phpt
index 6c6ceb2f9fe56..ae4555bb2ad72 100644
--- a/ext/gd/tests/imagetruecolortopalette_basic.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_basic.phpt
@@ -2,9 +2,10 @@
 Testing imagetruecolortopalette() of GD library
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded("gd")) die("skip GD not present");
     if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
         die("skip test requires GD 2.2.2 or higher");
     }
diff --git a/ext/gd/tests/imagetruecolortopalette_error3.phpt b/ext/gd/tests/imagetruecolortopalette_error3.phpt
index 58bd1cf1e884e..0cbeca7e6d8b0 100644
--- a/ext/gd/tests/imagetruecolortopalette_error3.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_error3.phpt
@@ -2,9 +2,10 @@
 Testing imagetruecolortopalette(): wrong parameters for parameter 3
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded("gd")) die("skip GD not present");
     if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagetruecolortopalette_error4.phpt b/ext/gd/tests/imagetruecolortopalette_error4.phpt
index 1d539cd4abaa5..d1e8cffc39d3b 100644
--- a/ext/gd/tests/imagetruecolortopalette_error4.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_error4.phpt
@@ -2,9 +2,10 @@
 Testing imagetruecolortopalette(): out of range parameter 3
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded("gd")) die("skip GD not present");
     if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagettftext_charmap_order.phpt b/ext/gd/tests/imagettftext_charmap_order.phpt
index 36d2449fb18c6..32d5c9d0d7e47 100644
--- a/ext/gd/tests/imagettftext_charmap_order.phpt
+++ b/ext/gd/tests/imagettftext_charmap_order.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Font charmap order is deterministic based on order in the font, use the selected encoding
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
     if(!function_exists('imagettftext')) die('skip imagettftext() not available');
   if(gd_info()['JIS-mapped Japanese Font Support']) die('skip JIS-mapped Japanese Font Support not supported');
 ?>
diff --git a/ext/gd/tests/imagetypes_bmp.phpt b/ext/gd/tests/imagetypes_bmp.phpt
index 8a92dda28f0e9..b1981f7e5b0f5 100644
--- a/ext/gd/tests/imagetypes_bmp.phpt
+++ b/ext/gd/tests/imagetypes_bmp.phpt
@@ -1,9 +1,7 @@
 --TEST--
 imagetypes() - BMP support
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip ext/gd required');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 var_dump((imagetypes() & IMG_BMP) == function_exists('imagebmp'));
diff --git a/ext/gd/tests/imagetypes_tga.phpt b/ext/gd/tests/imagetypes_tga.phpt
index 56d6b3c2edf0d..cc3705e1e22cd 100644
--- a/ext/gd/tests/imagetypes_tga.phpt
+++ b/ext/gd/tests/imagetypes_tga.phpt
@@ -1,9 +1,7 @@
 --TEST--
 imagetypes() - TGA support
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip ext/gd required');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 var_dump((imagetypes() & IMG_TGA) == function_exists('imagecreatefromtga'));
diff --git a/ext/gd/tests/imagewbmp-mb.phpt b/ext/gd/tests/imagewbmp-mb.phpt
index 664f42c4e3b93..2229d7bb512d1 100644
--- a/ext/gd/tests/imagewbmp-mb.phpt
+++ b/ext/gd/tests/imagewbmp-mb.phpt
@@ -1,9 +1,7 @@
 --TEST--
 imagewbmp
---SKIPIF--
-<?php
-        if (!function_exists('imagecreatefromwbmp')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $file = __DIR__ . '/im私はガラスを食べられます.wbmp';
diff --git a/ext/gd/tests/imagewbmp.phpt b/ext/gd/tests/imagewbmp.phpt
index ee5dd5c6e2a64..5a216600ca25b 100644
--- a/ext/gd/tests/imagewbmp.phpt
+++ b/ext/gd/tests/imagewbmp.phpt
@@ -1,9 +1,7 @@
 --TEST--
 imagewbmp
---SKIPIF--
-<?php
-        if (!function_exists('imagecreatefromwbmp')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $file = __DIR__ . '/im.wbmp';
diff --git a/ext/gd/tests/imagewbmp_nullbyte_injection.phpt b/ext/gd/tests/imagewbmp_nullbyte_injection.phpt
index 73ef5272f33a9..1c25fdab25646 100644
--- a/ext/gd/tests/imagewbmp_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagewbmp_nullbyte_injection.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Testing null byte injection in imagewbmp
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if(!extension_loaded('gd')){ die('skip gd extension not available'); }
 $support = gd_info();
 if (!isset($support['WBMP Support']) || $support['WBMP Support'] === false) {
     print 'skip wbmp support not available';
diff --git a/ext/gd/tests/imagewebp_nullbyte_injection.phpt b/ext/gd/tests/imagewebp_nullbyte_injection.phpt
index 4a0e69c164edb..3fcb687eeeab3 100644
--- a/ext/gd/tests/imagewebp_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagewebp_nullbyte_injection.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Testing null byte injection in imagewebp
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if(!extension_loaded('gd')){ die('skip gd extension not available'); }
 $support = gd_info();
 if (!isset($support['WebP Support']) || $support['WebP Support'] === false) {
     print 'skip webp support not available';
diff --git a/ext/gd/tests/imagexbm_nullbyte_injection.phpt b/ext/gd/tests/imagexbm_nullbyte_injection.phpt
index 8bd90b0d85b2c..701f910014c24 100644
--- a/ext/gd/tests/imagexbm_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagexbm_nullbyte_injection.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Testing null byte injection in imagexbm
---SKIPIF--
-<?php
-if(!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $image = imagecreate(1,1);// 1px image
diff --git a/ext/gd/tests/jpeg2png.phpt b/ext/gd/tests/jpeg2png.phpt
index cae283d10b968..1e0838395c559 100644
--- a/ext/gd/tests/jpeg2png.phpt
+++ b/ext/gd/tests/jpeg2png.phpt
@@ -1,11 +1,9 @@
 --TEST--
 jpeg <--> png conversion test
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available.");
-    }
-
     if (!function_exists("imagecreatefrompng") || !function_exists("imagepng")) {
         die("skip png support unavailable");
     }
diff --git a/ext/gd/tests/jpg2gd-mb.phpt b/ext/gd/tests/jpg2gd-mb.phpt
index d68ff24dd5635..63a6216ff0f64 100644
--- a/ext/gd/tests/jpg2gd-mb.phpt
+++ b/ext/gd/tests/jpg2gd-mb.phpt
@@ -1,11 +1,9 @@
 --TEST--
 jpeg <--> gd1/gd2 conversion test
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available.");
-    }
-
     if (!function_exists("imagecreatefromjpeg") || !function_exists("imagejpeg")) {
         die("skip jpeg support unavailable");
     }
diff --git a/ext/gd/tests/jpg2gd.phpt b/ext/gd/tests/jpg2gd.phpt
index 855f7a53212e4..ec99d4c8d0d9d 100644
--- a/ext/gd/tests/jpg2gd.phpt
+++ b/ext/gd/tests/jpg2gd.phpt
@@ -1,11 +1,9 @@
 --TEST--
 jpeg <--> gd1/gd2 conversion test
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available.");
-    }
-
     if (!function_exists("imagecreatefromjpeg") || !function_exists("imagejpeg")) {
         die("skip jpeg support unavailable");
     }
diff --git a/ext/gd/tests/libgd00086.phpt b/ext/gd/tests/libgd00086.phpt
index 69afee8090189..d8cde63842f0b 100644
--- a/ext/gd/tests/libgd00086.phpt
+++ b/ext/gd/tests/libgd00086.phpt
@@ -1,8 +1,9 @@
 --TEST--
 libgd #86 (Possible infinite loop in imagecreatefrompng)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
     if (!GD_BUNDLED) die("skip requires bundled GD library\n");
 ?>
 --FILE--
diff --git a/ext/gd/tests/libgd00086_extern.phpt b/ext/gd/tests/libgd00086_extern.phpt
index 1cdb28fee8623..707b910f8c172 100644
--- a/ext/gd/tests/libgd00086_extern.phpt
+++ b/ext/gd/tests/libgd00086_extern.phpt
@@ -1,8 +1,9 @@
 --TEST--
 libgd #86 (Possible infinite loop in imagecreatefrompng)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
     if (GD_BUNDLED) die("skip requires external GD library\n");
 ?>
 --FILE--
diff --git a/ext/gd/tests/libgd00094-mb.phpt b/ext/gd/tests/libgd00094-mb.phpt
index ca313893d52cc..63c91389088c5 100644
--- a/ext/gd/tests/libgd00094-mb.phpt
+++ b/ext/gd/tests/libgd00094-mb.phpt
@@ -1,8 +1,9 @@
 --TEST--
 libgd #94 (imagecreatefromxbm can crash if gdImageCreate fails)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
     if (!GD_BUNDLED) die("skip requires bundled GD library\n");
 ?>
 --FILE--
diff --git a/ext/gd/tests/libgd00094.phpt b/ext/gd/tests/libgd00094.phpt
index f9cbeec871916..16a914c25777e 100644
--- a/ext/gd/tests/libgd00094.phpt
+++ b/ext/gd/tests/libgd00094.phpt
@@ -1,8 +1,9 @@
 --TEST--
 libgd #94 (imagecreatefromxbm can crash if gdImageCreate fails)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
     if (!GD_BUNDLED) die("skip requires bundled GD library\n");
 ?>
 --FILE--
diff --git a/ext/gd/tests/libgd00100.phpt b/ext/gd/tests/libgd00100.phpt
index 9392fcf83469c..6b8299e2585b7 100644
--- a/ext/gd/tests/libgd00100.phpt
+++ b/ext/gd/tests/libgd00100.phpt
@@ -1,8 +1,9 @@
 --TEST--
 libgd #100 (spurious horizontal line drawn by gdImageFilledPolygon)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
     if (!GD_BUNDLED) die("skip requires bundled GD library\n");
 ?>
 --FILE--
diff --git a/ext/gd/tests/libgd00101.phpt b/ext/gd/tests/libgd00101.phpt
index 0206bd626b745..bd8e5ae726680 100644
--- a/ext/gd/tests/libgd00101.phpt
+++ b/ext/gd/tests/libgd00101.phpt
@@ -1,8 +1,9 @@
 --TEST--
 libgd #101 (imagecreatefromgd can crash if gdImageCreate fails)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
     if (!GD_BUNDLED) die("skip requires bundled GD library\n");
 ?>
 --FILE--
diff --git a/ext/gd/tests/libgd00106.phpt b/ext/gd/tests/libgd00106.phpt
index 151d126075559..ad7f714c1b8e1 100644
--- a/ext/gd/tests/libgd00106.phpt
+++ b/ext/gd/tests/libgd00106.phpt
@@ -1,9 +1,7 @@
 --TEST--
 libgd #106 (imagerectangle 1x1 draws 1x3)
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatetruecolor(10,10);
diff --git a/ext/gd/tests/libgd00186.phpt b/ext/gd/tests/libgd00186.phpt
index 0df501c268d45..fb9e2985ced48 100644
--- a/ext/gd/tests/libgd00186.phpt
+++ b/ext/gd/tests/libgd00186.phpt
@@ -1,9 +1,7 @@
 --TEST--
 libgd #186 (Tiling true colour with palette image does not work)
---SKIPIF--
-<?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatetruecolor(10,10);
diff --git a/ext/gd/tests/libgd00191.phpt b/ext/gd/tests/libgd00191.phpt
index 692d012c72ef2..85e86164ca7dc 100644
--- a/ext/gd/tests/libgd00191.phpt
+++ b/ext/gd/tests/libgd00191.phpt
@@ -1,8 +1,9 @@
 --TEST--
 libgd FS#191 (A circle becomes square)
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) die("skip gd extension not available\n");
     if (!GD_BUNDLED) die("skip requires bundled GD library\n");
 ?>
 --FILE--
diff --git a/ext/gd/tests/lines.phpt b/ext/gd/tests/lines.phpt
index 61e022d11acfc..7d0488ea4d2e2 100644
--- a/ext/gd/tests/lines.phpt
+++ b/ext/gd/tests/lines.phpt
@@ -1,9 +1,7 @@
 --TEST--
 imageline no AA
---SKIPIF--
-<?php
-        if (!function_exists('imageline')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $im = imagecreatetruecolor(6,6);
diff --git a/ext/gd/tests/png2gd.phpt b/ext/gd/tests/png2gd.phpt
index 0df1e0611a223..e2e0a57b9bf2b 100644
--- a/ext/gd/tests/png2gd.phpt
+++ b/ext/gd/tests/png2gd.phpt
@@ -1,11 +1,9 @@
 --TEST--
 png <--> gd1/gd2 conversion test
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available.");
-    }
-
     if (!function_exists("imagecreatefrompng") || !function_exists("imagepng")) {
         die("skip png support unavailable");
     }
diff --git a/ext/gd/tests/pngcomp.phpt b/ext/gd/tests/pngcomp.phpt
index 880e3a5b525b7..ece212d486cff 100644
--- a/ext/gd/tests/pngcomp.phpt
+++ b/ext/gd/tests/pngcomp.phpt
@@ -1,11 +1,9 @@
 --TEST--
 png compression test
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available.");
-    }
-
     if (!function_exists("imagecreatefrompng") || !function_exists("imagepng")) {
         die("skip png support unavailable");
     }
diff --git a/ext/gd/tests/test_image_equals_file_palette.phpt b/ext/gd/tests/test_image_equals_file_palette.phpt
index 51192a6ecd221..a1022138230f6 100644
--- a/ext/gd/tests/test_image_equals_file_palette.phpt
+++ b/ext/gd/tests/test_image_equals_file_palette.phpt
@@ -1,9 +1,7 @@
 --TEST--
 test_image_equals_file(): comparing palette images
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'func.inc';
diff --git a/ext/gd/tests/types.phpt b/ext/gd/tests/types.phpt
index 7510ba17c6129..42a36eb16741b 100644
--- a/ext/gd/tests/types.phpt
+++ b/ext/gd/tests/types.phpt
@@ -1,9 +1,7 @@
 --TEST--
 imagetypes
---SKIPIF--
-<?php
-        if (!function_exists('imagetypes')) die("skip gd extension not available\n");
-?>
+--EXTENSIONS--
+gd
 --FILE--
 <?php
 $flags = imagetypes();
diff --git a/ext/gd/tests/webp_basic.phpt b/ext/gd/tests/webp_basic.phpt
index 593e43c8070d6..1432d157e2939 100644
--- a/ext/gd/tests/webp_basic.phpt
+++ b/ext/gd/tests/webp_basic.phpt
@@ -1,8 +1,9 @@
 --TEST--
 imagewebp() and imagecreatefromwebp() - basic test
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.0', '<')) {
     die("skip test requires GD 2.2.0 or higher");
 }
diff --git a/ext/gd/tests/xbm2png.phpt b/ext/gd/tests/xbm2png.phpt
index c3b77f2e369a1..ad405d5d6f21b 100644
--- a/ext/gd/tests/xbm2png.phpt
+++ b/ext/gd/tests/xbm2png.phpt
@@ -1,10 +1,9 @@
 --TEST--
 xbm --> png conversion test
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available.");
-    }
     if (!function_exists("imagepng")) {
         die("skip png support unavailable");
     }
diff --git a/ext/gd/tests/xpm2gd.phpt b/ext/gd/tests/xpm2gd.phpt
index 47e6c2faf1da5..ce9852cd62da1 100644
--- a/ext/gd/tests/xpm2gd.phpt
+++ b/ext/gd/tests/xpm2gd.phpt
@@ -1,11 +1,9 @@
 --TEST--
 xpm --> gd1/gd2 conversion test
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available.");
-    }
-
     if (!function_exists("imagecreatefromxpm")) {
         die("skip xpm read support unavailable");
     }
diff --git a/ext/gd/tests/xpm2jpg.phpt b/ext/gd/tests/xpm2jpg.phpt
index c16c3d89cf878..470f6acb8777c 100644
--- a/ext/gd/tests/xpm2jpg.phpt
+++ b/ext/gd/tests/xpm2jpg.phpt
@@ -1,11 +1,9 @@
 --TEST--
 xpm --> jpeg conversion test
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available.");
-    }
-
     if (!function_exists("imagejpeg")) {
         die("skip jpeg support unavailable");
     }
diff --git a/ext/gd/tests/xpm2png.phpt b/ext/gd/tests/xpm2png.phpt
index c9902f07631b1..e0e6061ad760e 100644
--- a/ext/gd/tests/xpm2png.phpt
+++ b/ext/gd/tests/xpm2png.phpt
@@ -1,11 +1,9 @@
 --TEST--
 xpm --> png conversion test
+--EXTENSIONS--
+gd
 --SKIPIF--
 <?php
-    if (!extension_loaded('gd')) {
-        die("skip gd extension not available.");
-    }
-
     if (!function_exists("imagepng")) {
         die("skip png support unavailable");
     }

From b60ab925a4cc9ff26491be180324edc7ca801864 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Sun, 16 May 2021 22:51:09 +0200
Subject: [PATCH 2/2] Remove superfluous SKIPIF

---
 ext/gd/tests/imageflip.phpt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ext/gd/tests/imageflip.phpt b/ext/gd/tests/imageflip.phpt
index a67ecbce2ac5b..6c27e15b8d4b6 100644
--- a/ext/gd/tests/imageflip.phpt
+++ b/ext/gd/tests/imageflip.phpt
@@ -2,10 +2,6 @@
 Testing imageflip() of GD library
 --EXTENSIONS--
 gd
---SKIPIF--
-<?php
-if (!function_exists('imageflip')) die( 'skip GD not present; skipping test' );
-?>
 --FILE--
 <?php