diff --git a/ext/exif/tests/bug48378.jpeg b/ext/exif/tests/bug48378.jpg
similarity index 100%
rename from ext/exif/tests/bug48378.jpeg
rename to ext/exif/tests/bug48378.jpg
diff --git a/ext/exif/tests/bug48378.phpt b/ext/exif/tests/bug48378.phpt
index a830f226b11..a232bedf434 100644
--- a/ext/exif/tests/bug48378.phpt
+++ b/ext/exif/tests/bug48378.phpt
@@ -5,7 +5,7 @@ Bug #48378 (Infinite recursion due to corrupt JPEG)
 --FILE--
 <?php
 exif_read_data(
-__DIR__ . "/bug48378.jpeg",
+__DIR__ . "/bug48378.jpg",
 "FILE,COMPUTED,ANY_TAG"
 );
 ?>
diff --git a/ext/exif/tests/bug54002.phpt b/ext/exif/tests/bug54002.phpt
index 031afad072c..f9608b9939c 100644
--- a/ext/exif/tests/bug54002.phpt
+++ b/ext/exif/tests/bug54002.phpt
@@ -6,11 +6,11 @@ memory_limit=-1
 <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
 --FILE--
 <?php
-exif_read_data(__DIR__ . '/bug54002_1.jpeg');
-exif_read_data(__DIR__ . '/bug54002_2.jpeg');
+exif_read_data(__DIR__ . '/bug54002_1.jpg');
+exif_read_data(__DIR__ . '/bug54002_2.jpg');
 
 ?>
 --EXPECTF--
-Warning: exif_read_data(bug54002_1.jpeg): Process tag(x0205=UndefinedTa): Illegal byte_count in %sbug54002.php on line %d
+Warning: exif_read_data(bug54002_1.jpg): Process tag(x0205=UndefinedTa): Illegal byte_count in %sbug54002.php on line %d
 
-Warning: exif_read_data(bug54002_2.jpeg): Process tag(x0205=UndefinedTa): Illegal byte_count in %sbug54002.php on line %d
+Warning: exif_read_data(bug54002_2.jpg): Process tag(x0205=UndefinedTa): Illegal byte_count in %sbug54002.php on line %d
diff --git a/ext/exif/tests/bug54002_1.jpeg b/ext/exif/tests/bug54002_1.jpg
similarity index 100%
rename from ext/exif/tests/bug54002_1.jpeg
rename to ext/exif/tests/bug54002_1.jpg
diff --git a/ext/exif/tests/bug54002_2.jpeg b/ext/exif/tests/bug54002_2.jpg
similarity index 100%
rename from ext/exif/tests/bug54002_2.jpeg
rename to ext/exif/tests/bug54002_2.jpg
diff --git a/ext/exif/tests/bug72603.jpeg b/ext/exif/tests/bug72603.jpg
similarity index 100%
rename from ext/exif/tests/bug72603.jpeg
rename to ext/exif/tests/bug72603.jpg
diff --git a/ext/exif/tests/bug72603.phpt b/ext/exif/tests/bug72603.phpt
index eacb6ee45a5..1df7bdb055b 100644
--- a/ext/exif/tests/bug72603.phpt
+++ b/ext/exif/tests/bug72603.phpt
@@ -4,8 +4,8 @@ Bug #72603 (Out of bound read in exif_process_IFD_in_MAKERNOTE)
 <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
 --FILE--
 <?php
-var_dump(count(exif_read_data(__DIR__ . "/bug72603.jpeg")));
+var_dump(count(exif_read_data(__DIR__ . "/bug72603.jpg")));
 ?>
 --EXPECTF--
-Warning: exif_read_data(bug72603.jpeg): %s in %s%ebug72603.php on line %d
+Warning: exif_read_data(bug72603.jpg): %s in %s%ebug72603.php on line %d
 int(%d)
diff --git a/ext/gd/tests/bug67325.jpeg b/ext/gd/tests/bug67325.jpg
similarity index 100%
rename from ext/gd/tests/bug67325.jpeg
rename to ext/gd/tests/bug67325.jpg
diff --git a/ext/gd/tests/bug67325.phpt b/ext/gd/tests/bug67325.phpt
index 97072fe14e0..8290946c0fc 100644
--- a/ext/gd/tests/bug67325.phpt
+++ b/ext/gd/tests/bug67325.phpt
@@ -10,7 +10,7 @@ if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.3', '<=')) {
 ?>
 --FILE--
 <?php
-$filename = __DIR__ . DIRECTORY_SEPARATOR . 'bug67325.jpeg';
+$filename = __DIR__ . DIRECTORY_SEPARATOR . 'bug67325.jpg';
 
 $im = imagecreatefromjpeg($filename);
 imagetruecolortopalette($im, 0, 256);
diff --git a/ext/gd/tests/bug77195.jpeg b/ext/gd/tests/bug77195.jpg
similarity index 100%
rename from ext/gd/tests/bug77195.jpeg
rename to ext/gd/tests/bug77195.jpg
diff --git a/ext/gd/tests/bug77195.phpt b/ext/gd/tests/bug77195.phpt
index 1eb9024ce8c..5aa1f51b02f 100644
--- a/ext/gd/tests/bug77195.phpt
+++ b/ext/gd/tests/bug77195.phpt
@@ -7,7 +7,7 @@ if (!gd_info()['JPEG Support']) die('skip JPEG support not available');
 ?>
 --FILE--
 <?php
-$filename = __DIR__ . '/bug77195.jpeg';
+$filename = __DIR__ . '/bug77195.jpg';
 @imagecreatefromjpeg($filename);
 imagecreatefromjpeg($filename);
 ?>
diff --git a/ext/gd/tests/conv_test.jpeg b/ext/gd/tests/conv_test.jpg
similarity index 100%
rename from ext/gd/tests/conv_test.jpeg
rename to ext/gd/tests/conv_test.jpg
diff --git a/ext/gd/tests/conv_test私はガラスを食べられます.jpeg b/ext/gd/tests/conv_test私はガラスを食べられます.jpg
similarity index 100%
rename from ext/gd/tests/conv_test私はガラスを食べられます.jpeg
rename to ext/gd/tests/conv_test私はガラスを食べられます.jpg
diff --git a/ext/gd/tests/gif.phpt b/ext/gd/tests/gif.phpt
index 218ef50fa43..39ade092c20 100644
--- a/ext/gd/tests/gif.phpt
+++ b/ext/gd/tests/gif.phpt
@@ -122,7 +122,7 @@ if (check_box($i,$i,$i)) {
 }
 
 
-$im = imagecreatefromjpeg($cwd . '/conv_test.jpeg');
+$im = imagecreatefromjpeg($cwd . '/conv_test.jpg');
 imagefilledrectangle($im, 5,5, 10,10, 0xffffff);
 imagegif($im, $cwd . '/test_gif.gif');
 imagegif($im, $cwd . '/test_gif_2.gif');
diff --git a/ext/gd/tests/jpeg2png.phpt b/ext/gd/tests/jpeg2png.phpt
index 6e136514a85..8d14b33e3ad 100644
--- a/ext/gd/tests/jpeg2png.phpt
+++ b/ext/gd/tests/jpeg2png.phpt
@@ -26,7 +26,7 @@ jpeg <--> png conversion test
 	echo "\n";
 
 	echo "JPEG to PNG conversion: ";
-	echo imagepng(imagecreatefromjpeg($cwd . "/conv_test.jpeg"), $cwd . "/test_png.png") ? 'ok' : 'failed';
+	echo imagepng(imagecreatefromjpeg($cwd . "/conv_test.jpg"), $cwd . "/test_png.png") ? 'ok' : 'failed';
 	echo "\n";
 
 	echo "Generated PNG to JPEG conversion: ";
diff --git a/ext/gd/tests/jpg2gd-mb.phpt b/ext/gd/tests/jpg2gd-mb.phpt
index 85959b4271c..b7c0b98ab49 100644
--- a/ext/gd/tests/jpg2gd-mb.phpt
+++ b/ext/gd/tests/jpg2gd-mb.phpt
@@ -15,11 +15,11 @@ jpeg <--> gd1/gd2 conversion test
 	$cwd = __DIR__;
 
 	echo "JPEG to GD1 conversion: ";
-	echo imagegd(imagecreatefromjpeg($cwd . "/conv_test私はガラスを食べられます.jpeg"), $cwd . "/test私はガラスを食べられます.gd1") ? 'ok' : 'failed';
+	echo imagegd(imagecreatefromjpeg($cwd . "/conv_test私はガラスを食べられます.jpg"), $cwd . "/test私はガラスを食べられます.gd1") ? 'ok' : 'failed';
 	echo "\n";
 
 	echo "JPEG to GD2 conversion: ";
-	echo imagegd2(imagecreatefromjpeg($cwd . "/conv_test私はガラスを食べられます.jpeg"), $cwd . "/test私はガラスを食べられます.gd2") ? 'ok' : 'failed';
+	echo imagegd2(imagecreatefromjpeg($cwd . "/conv_test私はガラスを食べられます.jpg"), $cwd . "/test私はガラスを食べられます.gd2") ? 'ok' : 'failed';
 	echo "\n";
 
 	echo "GD1 to JPEG conversion: ";
diff --git a/ext/gd/tests/jpg2gd.phpt b/ext/gd/tests/jpg2gd.phpt
index 672a392df03..6ec714ef279 100644
--- a/ext/gd/tests/jpg2gd.phpt
+++ b/ext/gd/tests/jpg2gd.phpt
@@ -15,11 +15,11 @@ jpeg <--> gd1/gd2 conversion test
 	$cwd = __DIR__;
 
 	echo "JPEG to GD1 conversion: ";
-	echo imagegd(imagecreatefromjpeg($cwd . "/conv_test.jpeg"), $cwd . "/test_jpeg.gd1") ? 'ok' : 'failed';
+	echo imagegd(imagecreatefromjpeg($cwd . "/conv_test.jpg"), $cwd . "/test_jpeg.gd1") ? 'ok' : 'failed';
 	echo "\n";
 
 	echo "JPEG to GD2 conversion: ";
-	echo imagegd2(imagecreatefromjpeg($cwd . "/conv_test.jpeg"), $cwd . "/test_jpeg.gd2") ? 'ok' : 'failed';
+	echo imagegd2(imagecreatefromjpeg($cwd . "/conv_test.jpg"), $cwd . "/test_jpeg.gd2") ? 'ok' : 'failed';
 	echo "\n";
 
 	echo "GD1 to JPEG conversion: ";