diff --git a/Tests/LibGfx/BenchmarkJPEGLoader.cpp b/Tests/LibGfx/BenchmarkJPEGLoader.cpp
index b8ebd8557b..2fd6ff7a97 100644
--- a/Tests/LibGfx/BenchmarkJPEGLoader.cpp
+++ b/Tests/LibGfx/BenchmarkJPEGLoader.cpp
@@ -17,10 +17,10 @@
 // FIXME: Enable formatting when the patch will be mainstream
 //        https://github.com/llvm/llvm-project/commit/fd86789962964a98157e8159c3d95cdc241942e3
 // clang-format off
-auto small_image = Core::File::open(TEST_INPUT("rgb24.jpg"sv), Core::File::OpenMode::Read).release_value()->read_until_eof().release_value();
-auto big_image = Core::File::open(TEST_INPUT("big_image.jpg"sv), Core::File::OpenMode::Read).release_value()->read_until_eof().release_value();
-auto rgb_image = Core::File::open(TEST_INPUT("rgb_components.jpg"sv), Core::File::OpenMode::Read).release_value()->read_until_eof().release_value();
-auto several_scans = Core::File::open(TEST_INPUT("several_scans.jpg"sv), Core::File::OpenMode::Read).release_value()->read_until_eof().release_value();
+auto small_image = Core::File::open(TEST_INPUT("jpg/rgb24.jpg"sv), Core::File::OpenMode::Read).release_value()->read_until_eof().release_value();
+auto big_image = Core::File::open(TEST_INPUT("jpg/big_image.jpg"sv), Core::File::OpenMode::Read).release_value()->read_until_eof().release_value();
+auto rgb_image = Core::File::open(TEST_INPUT("jpg/rgb_components.jpg"sv), Core::File::OpenMode::Read).release_value()->read_until_eof().release_value();
+auto several_scans = Core::File::open(TEST_INPUT("jpg/several_scans.jpg"sv), Core::File::OpenMode::Read).release_value()->read_until_eof().release_value();
 // clang-format on
 
 BENCHMARK_CASE(small_image)
diff --git a/Tests/LibGfx/TestImageDecoder.cpp b/Tests/LibGfx/TestImageDecoder.cpp
index 05d1feff4e..3fc388f41a 100644
--- a/Tests/LibGfx/TestImageDecoder.cpp
+++ b/Tests/LibGfx/TestImageDecoder.cpp
@@ -88,7 +88,7 @@ TEST_CASE(test_bmp_embedded_in_ico)
 
 TEST_CASE(test_jpeg_sof0_one_scan)
 {
-    auto file = MUST(Core::MappedFile::map(TEST_INPUT("rgb24.jpg"sv)));
+    auto file = MUST(Core::MappedFile::map(TEST_INPUT("jpg/rgb24.jpg"sv)));
     EXPECT(Gfx::JPEGImageDecoderPlugin::sniff(file->bytes()));
     auto plugin_decoder = MUST(Gfx::JPEGImageDecoderPlugin::create(file->bytes()));
     MUST(plugin_decoder->initialize());
@@ -103,7 +103,7 @@ TEST_CASE(test_jpeg_sof0_one_scan)
 
 TEST_CASE(test_jpeg_sof0_several_scans)
 {
-    auto file = MUST(Core::MappedFile::map(TEST_INPUT("several_scans.jpg"sv)));
+    auto file = MUST(Core::MappedFile::map(TEST_INPUT("jpg/several_scans.jpg"sv)));
     EXPECT(Gfx::JPEGImageDecoderPlugin::sniff(file->bytes()));
     auto plugin_decoder = MUST(Gfx::JPEGImageDecoderPlugin::create(file->bytes()));
     MUST(plugin_decoder->initialize());
@@ -114,7 +114,7 @@ TEST_CASE(test_jpeg_sof0_several_scans)
 
 TEST_CASE(test_jpeg_rgb_components)
 {
-    auto file = MUST(Core::MappedFile::map(TEST_INPUT("rgb_components.jpg"sv)));
+    auto file = MUST(Core::MappedFile::map(TEST_INPUT("jpg/rgb_components.jpg"sv)));
     EXPECT(Gfx::JPEGImageDecoderPlugin::sniff(file->bytes()));
     auto plugin_decoder = MUST(Gfx::JPEGImageDecoderPlugin::create(file->bytes()));
     MUST(plugin_decoder->initialize());
@@ -125,7 +125,7 @@ TEST_CASE(test_jpeg_rgb_components)
 
 TEST_CASE(test_jpeg_sof2_spectral_selection)
 {
-    auto file = MUST(Core::MappedFile::map(TEST_INPUT("spectral_selection.jpg"sv)));
+    auto file = MUST(Core::MappedFile::map(TEST_INPUT("jpg/spectral_selection.jpg"sv)));
     EXPECT(Gfx::JPEGImageDecoderPlugin::sniff(file->bytes()));
     auto plugin_decoder = MUST(Gfx::JPEGImageDecoderPlugin::create(file->bytes()));
     MUST(plugin_decoder->initialize());
@@ -136,7 +136,7 @@ TEST_CASE(test_jpeg_sof2_spectral_selection)
 
 TEST_CASE(test_jpeg_sof0_several_scans_odd_number_mcu)
 {
-    auto file = MUST(Core::MappedFile::map(TEST_INPUT("several_scans_odd_number_mcu.jpg"sv)));
+    auto file = MUST(Core::MappedFile::map(TEST_INPUT("jpg/several_scans_odd_number_mcu.jpg"sv)));
     EXPECT(Gfx::JPEGImageDecoderPlugin::sniff(file->bytes()));
     auto plugin_decoder = MUST(Gfx::JPEGImageDecoderPlugin::create(file->bytes()));
     MUST(plugin_decoder->initialize());
@@ -147,7 +147,7 @@ TEST_CASE(test_jpeg_sof0_several_scans_odd_number_mcu)
 
 TEST_CASE(test_jpeg_sof2_successive_aproximation)
 {
-    auto file = MUST(Core::MappedFile::map(TEST_INPUT("successive_approximation.jpg"sv)));
+    auto file = MUST(Core::MappedFile::map(TEST_INPUT("jpg/successive_approximation.jpg"sv)));
     EXPECT(Gfx::JPEGImageDecoderPlugin::sniff(file->bytes()));
     auto plugin_decoder = MUST(Gfx::JPEGImageDecoderPlugin::create(file->bytes()));
     MUST(plugin_decoder->initialize());
@@ -158,7 +158,7 @@ TEST_CASE(test_jpeg_sof2_successive_aproximation)
 
 TEST_CASE(test_jpeg_sof1_12bits)
 {
-    auto file = MUST(Core::MappedFile::map(TEST_INPUT("12-bit.jpg"sv)));
+    auto file = MUST(Core::MappedFile::map(TEST_INPUT("jpg/12-bit.jpg"sv)));
     EXPECT(Gfx::JPEGImageDecoderPlugin::sniff(file->bytes()));
     auto plugin_decoder = MUST(Gfx::JPEGImageDecoderPlugin::create(file->bytes()));
     MUST(plugin_decoder->initialize());
@@ -169,7 +169,7 @@ TEST_CASE(test_jpeg_sof1_12bits)
 
 TEST_CASE(test_jpeg_sof2_12bits)
 {
-    auto file = MUST(Core::MappedFile::map(TEST_INPUT("12-bit-progressive.jpg"sv)));
+    auto file = MUST(Core::MappedFile::map(TEST_INPUT("jpg/12-bit-progressive.jpg"sv)));
     EXPECT(Gfx::JPEGImageDecoderPlugin::sniff(file->bytes()));
     auto plugin_decoder = MUST(Gfx::JPEGImageDecoderPlugin::create(file->bytes()));
     MUST(plugin_decoder->initialize());
diff --git a/Tests/LibGfx/test-inputs/12-bit-progressive.jpg b/Tests/LibGfx/test-inputs/jpg/12-bit-progressive.jpg
similarity index 100%
rename from Tests/LibGfx/test-inputs/12-bit-progressive.jpg
rename to Tests/LibGfx/test-inputs/jpg/12-bit-progressive.jpg
diff --git a/Tests/LibGfx/test-inputs/12-bit.jpg b/Tests/LibGfx/test-inputs/jpg/12-bit.jpg
similarity index 100%
rename from Tests/LibGfx/test-inputs/12-bit.jpg
rename to Tests/LibGfx/test-inputs/jpg/12-bit.jpg
diff --git a/Tests/LibGfx/test-inputs/big_image.jpg b/Tests/LibGfx/test-inputs/jpg/big_image.jpg
similarity index 100%
rename from Tests/LibGfx/test-inputs/big_image.jpg
rename to Tests/LibGfx/test-inputs/jpg/big_image.jpg
diff --git a/Tests/LibGfx/test-inputs/rgb24.jpg b/Tests/LibGfx/test-inputs/jpg/rgb24.jpg
similarity index 100%
rename from Tests/LibGfx/test-inputs/rgb24.jpg
rename to Tests/LibGfx/test-inputs/jpg/rgb24.jpg
diff --git a/Tests/LibGfx/test-inputs/rgb_components.jpg b/Tests/LibGfx/test-inputs/jpg/rgb_components.jpg
similarity index 100%
rename from Tests/LibGfx/test-inputs/rgb_components.jpg
rename to Tests/LibGfx/test-inputs/jpg/rgb_components.jpg
diff --git a/Tests/LibGfx/test-inputs/several_scans.jpg b/Tests/LibGfx/test-inputs/jpg/several_scans.jpg
similarity index 100%
rename from Tests/LibGfx/test-inputs/several_scans.jpg
rename to Tests/LibGfx/test-inputs/jpg/several_scans.jpg
diff --git a/Tests/LibGfx/test-inputs/several_scans_odd_number_mcu.jpg b/Tests/LibGfx/test-inputs/jpg/several_scans_odd_number_mcu.jpg
similarity index 100%
rename from Tests/LibGfx/test-inputs/several_scans_odd_number_mcu.jpg
rename to Tests/LibGfx/test-inputs/jpg/several_scans_odd_number_mcu.jpg
diff --git a/Tests/LibGfx/test-inputs/spectral_selection.jpg b/Tests/LibGfx/test-inputs/jpg/spectral_selection.jpg
similarity index 100%
rename from Tests/LibGfx/test-inputs/spectral_selection.jpg
rename to Tests/LibGfx/test-inputs/jpg/spectral_selection.jpg
diff --git a/Tests/LibGfx/test-inputs/successive_approximation.jpg b/Tests/LibGfx/test-inputs/jpg/successive_approximation.jpg
similarity index 100%
rename from Tests/LibGfx/test-inputs/successive_approximation.jpg
rename to Tests/LibGfx/test-inputs/jpg/successive_approximation.jpg