diff --git a/Tests/LibGfx/TestImageDecoder.cpp b/Tests/LibGfx/TestImageDecoder.cpp
index 001b68acea..ef9e5a54fd 100644
--- a/Tests/LibGfx/TestImageDecoder.cpp
+++ b/Tests/LibGfx/TestImageDecoder.cpp
@@ -53,7 +53,16 @@ static Gfx::ImageFrameDescriptor expect_single_frame_of_size(Gfx::ImageDecoderPl
 
 TEST_CASE(test_bmp)
 {
-    auto file = MUST(Core::MappedFile::map(TEST_INPUT("rgba32-1.bmp"sv)));
+    auto file = MUST(Core::MappedFile::map(TEST_INPUT("bmp/rgba32-1.bmp"sv)));
+    EXPECT(Gfx::BMPImageDecoderPlugin::sniff(file->bytes()));
+    auto plugin_decoder = MUST(Gfx::BMPImageDecoderPlugin::create(file->bytes()));
+
+    expect_single_frame(*plugin_decoder);
+}
+
+TEST_CASE(test_bmp_top_down)
+{
+    auto file = MUST(Core::MappedFile::map(TEST_INPUT("bmp/top-down.bmp"sv)));
     EXPECT(Gfx::BMPImageDecoderPlugin::sniff(file->bytes()));
     auto plugin_decoder = MUST(Gfx::BMPImageDecoderPlugin::create(file->bytes()));
 
diff --git a/Tests/LibGfx/test-inputs/rgba32-1.bmp b/Tests/LibGfx/test-inputs/bmp/rgba32-1.bmp
similarity index 100%
rename from Tests/LibGfx/test-inputs/rgba32-1.bmp
rename to Tests/LibGfx/test-inputs/bmp/rgba32-1.bmp
diff --git a/Tests/LibGfx/test-inputs/bmp/top-down.bmp b/Tests/LibGfx/test-inputs/bmp/top-down.bmp
new file mode 100644
index 0000000000..ec1f748d7c
Binary files /dev/null and b/Tests/LibGfx/test-inputs/bmp/top-down.bmp differ