diff --git a/src/Magnum/GL/Test/FramebufferGLTest.cpp b/src/Magnum/GL/Test/FramebufferGLTest.cpp
index 7faa77aa3..e53112296 100644
--- a/src/Magnum/GL/Test/FramebufferGLTest.cpp
+++ b/src/Magnum/GL/Test/FramebufferGLTest.cpp
@@ -2255,13 +2255,25 @@ void FramebufferGLTest::implementationColorReadFormat() {
     PixelFormat format = framebuffer.implementationColorReadFormat();
     PixelType type = framebuffer.implementationColorReadType();
 
-    #ifdef CORRADE_TARGET_WINDOWS
-    CORRADE_EXPECT_FAIL_IF((Context::current().detectedDriver() & Context::DetectedDriver::IntelWindows) && data.renderbufferFormat != RenderbufferFormat::RGBA8,
-        "Framebuffer format queries on Intel Windows drivers are broken beyond repair for any non-trivial value.");
-    #endif
-    MAGNUM_VERIFY_NO_GL_ERROR();
-    CORRADE_COMPARE(format, data.expectedFormat);
-    CORRADE_COMPARE(type, data.expectedType);
+    {
+        #ifdef CORRADE_TARGET_WINDOWS
+        CORRADE_EXPECT_FAIL_IF((Context::current().detectedDriver() & Context::DetectedDriver::IntelWindows) && data.renderbufferFormat != RenderbufferFormat::RGBA8,
+            "Framebuffer format queries on Intel Windows drivers are broken beyond repair for any non-trivial value.");
+        #endif
+        MAGNUM_VERIFY_NO_GL_ERROR();
+    } {
+        #ifdef CORRADE_TARGET_WINDOWS
+        CORRADE_EXPECT_FAIL_IF(((Context::current().detectedDriver() & Context::DetectedDriver::IntelWindows) && data.renderbufferFormat != RenderbufferFormat::RGBA8) || ((Context::current().detectedDriver() & Context::DetectedDriver::Amd) && data.renderbufferFormat != RenderbufferFormat::RGBA8 && data.renderbufferFormat != RenderbufferFormat::RGBA16F),
+            "Framebuffer format queries on Intel Windows drivers are broken beyond repair for any non-trivial value; on AMD drivers always report RGBA8.");
+        #endif
+        CORRADE_COMPARE(format, data.expectedFormat);
+    } {
+        #ifdef CORRADE_TARGET_WINDOWS
+        CORRADE_EXPECT_FAIL_IF(((Context::current().detectedDriver() & Context::DetectedDriver::IntelWindows) && data.renderbufferFormat != RenderbufferFormat::RGBA8) || ((Context::current().detectedDriver() & Context::DetectedDriver::Amd) && data.renderbufferFormat != RenderbufferFormat::RGBA8),
+            "Framebuffer format queries on Intel Windows drivers are broken beyond repair for any non-trivial value; on AMD drivers always report RGBA8.");
+        #endif
+        CORRADE_COMPARE(type, data.expectedType);
+    }
 }
 
 }}}}