diff --git a/libcxx/test/std/experimental/simd/test_utils.h b/libcxx/test/std/experimental/simd/test_utils.h
--- a/libcxx/test/std/experimental/simd/test_utils.h
+++ b/libcxx/test/std/experimental/simd/test_utils.h
@@ -40,8 +40,8 @@
   }
 };
 
-// TODO: Support long double (12 bytes) for MinGW (DLL, i686)
-#ifdef __MINGW32__
+// TODO: Support long double (12 bytes) on 32-bit x86
+#if defined(__i386__) || defined(__i686__)
 using arithmetic_no_bool_types = types::concatenate_t<types::integer_types, types::type_list<float, double>>;
 #else
 using arithmetic_no_bool_types = types::concatenate_t<types::integer_types, types::floating_point_types>;