diff --git a/ext/gd/tests/bug39780_extern.phpt b/ext/gd/tests/bug39780_extern.phpt
index 5409103b516dd..2330bd65e57ab 100644
--- a/ext/gd/tests/bug39780_extern.phpt
+++ b/ext/gd/tests/bug39780_extern.phpt
@@ -13,7 +13,9 @@ $im = imagecreatefrompng(__DIR__ . '/bug39780.png');
 var_dump($im);
 ?>
 --EXPECTF--
-gd-png:  fatal libpng error: Read Error: truncated data
-gd-png error: setjmp returns error condition 2
-Warning: imagecreatefrompng(): v%sbug39780.png" is not a valid PNG file in /%s on line %d
+Warning: imagecreatefrompng(): gd-png: fatal libpng error: Read Error: truncated data%win %s on line %d
+
+Warning: imagecreatefrompng(): gd-png error: setjmp returns error condition %d%win %s on line %d
+
+Warning: imagecreatefrompng(): "%sbug39780.png" is not a valid PNG file in %s on line %d
 bool(false)
diff --git a/ext/gd/tests/bug66356.phpt b/ext/gd/tests/bug66356.phpt
index e15308dc1c183..b65fb54f57184 100644
--- a/ext/gd/tests/bug66356.phpt
+++ b/ext/gd/tests/bug66356.phpt
@@ -38,7 +38,7 @@ Array
     [height] => 10
 )
 
-Warning: imagecrop(): One parameter to a memory allocation multiplication is negative or zero, failing operation gracefully
+Warning: imagecrop(): %cne parameter to a memory allocation multiplication is negative or zero, failing operation gracefully
  in %s on line %d
 bool(false)
 object(GdImage)#2 (0) {
@@ -46,6 +46,6 @@ object(GdImage)#2 (0) {
 object(GdImage)#2 (0) {
 }
 
-Warning: imagecrop(): Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
+Warning: imagecrop(): %croduct of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
  in %s on line %d
 bool(false)
diff --git a/ext/gd/tests/bug77272.phpt b/ext/gd/tests/bug77272.phpt
index fc5ee464a07bb..f2483f915c17b 100644
--- a/ext/gd/tests/bug77272.phpt
+++ b/ext/gd/tests/bug77272.phpt
@@ -16,6 +16,6 @@ $img = imagecreate(2**28, 1);
 var_dump(imagescale($img, 1, 1, IMG_TRIANGLE));
 ?>
 --EXPECTF--
-Warning: imagescale():%S Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
+Warning: imagescale():%S %croduct of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
  in %s on line %d
 bool(false)
diff --git a/ext/gd/tests/bug77479.phpt b/ext/gd/tests/bug77479.phpt
index 332b2210715cc..504ff7abca1c0 100644
--- a/ext/gd/tests/bug77479.phpt
+++ b/ext/gd/tests/bug77479.phpt
@@ -15,10 +15,10 @@ imagecolorallocate($im, 0, 0, 0);
 imagewbmp($im, __DIR__ . '/77479.wbmp');
 ?>
 --EXPECTF--
-Warning: imagewbmp():%S Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
+Warning: imagewbmp():%S %croduct of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
  in %s on line %d
 
-Warning: imagewbmp(): Could not create WBMP in %s on line %d
+Warning: imagewbmp(): Could not create WBMP%win %s on line %d
 --CLEAN--
 <?php
 @unlink(__DIR__ . '/77479.wbmp');
diff --git a/ext/gd/tests/createfromwbmp2_extern.phpt b/ext/gd/tests/createfromwbmp2_extern.phpt
index e3dfcfc7bbdfc..5cd178cb59e52 100644
--- a/ext/gd/tests/createfromwbmp2_extern.phpt
+++ b/ext/gd/tests/createfromwbmp2_extern.phpt
@@ -43,6 +43,6 @@ $im = imagecreatefromwbmp($filename);
 unlink($filename);
 ?>
 --EXPECTF--
-gd warning: Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
+Warning: imagecreatefromwbmp(): %croduct of memory allocation multiplication would exceed INT_MAX, failing operation gracefully%win %s on line %d
 
 Warning: imagecreatefromwbmp(): "%s_tmp.wbmp" is not a valid WBMP file in %s on line %d
diff --git a/ext/gd/tests/imagegd_truecolor.phpt b/ext/gd/tests/imagegd_truecolor.phpt
index d207485b5271a..14bb8ce92fa98 100644
--- a/ext/gd/tests/imagegd_truecolor.phpt
+++ b/ext/gd/tests/imagegd_truecolor.phpt
@@ -2,6 +2,12 @@
 imagegd() writes truecolor images without palette conversion
 --EXTENSIONS--
 gd
+--SKIPIF--
+<?php
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.3.3', '>=')) {
+        die("skip test requires GD 2.3.2 or older");
+    }
+?>
 --FILE--
 <?php
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'func.inc';
diff --git a/ext/gd/tests/libgd00086_extern.phpt b/ext/gd/tests/libgd00086_extern.phpt
index 707b910f8c172..8d2b0b7d8dbe8 100644
--- a/ext/gd/tests/libgd00086_extern.phpt
+++ b/ext/gd/tests/libgd00086_extern.phpt
@@ -13,8 +13,9 @@ $im = imagecreatefrompng(__DIR__ . '/libgd00086.png');
 var_dump($im);
 ?>
 --EXPECTF--
-gd-png:  fatal libpng error: Read Error: truncated data
-gd-png error: setjmp returns error condition 1
+Warning: imagecreatefrompng(): gd-png: fatal libpng error: Read Error: truncated data%win %s on line %d
+
+Warning: imagecreatefrompng(): gd-png error: setjmp returns error condition %d%win %s on line %d
 
 Warning: imagecreatefrompng(): "%slibgd00086.png" is not a valid PNG file in %s on line %d
 bool(false)