diff --git a/src/test/run-make/extern-fn-struct-passing-abi/test.rs b/src/test/run-make/extern-fn-struct-passing-abi/test.rs
index 93cd6260e0c..54a4f868eb4 100644
--- a/src/test/run-make/extern-fn-struct-passing-abi/test.rs
+++ b/src/test/run-make/extern-fn-struct-passing-abi/test.rs
@@ -135,9 +135,10 @@ fn main() {
         assert_eq!(float_point(p), p);
         assert_eq!(int_odd(i), i);
 
-        // mingw64-gcc uses the wrong ABI:
-        // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82028
-        #[cfg(not(all(windows, target_arch = "x86_64", target_env = "gnu")))]
+        // MSVC/GCC/Clang are not consistent in the ABI of single-float aggregates.
+        // x86_64: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82028
+        // i686: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82041
+        #[cfg(not(all(windows, target_env = "gnu")))]
         assert_eq!(float_one(f1), f1);
     }
 }