diff --git a/test/support/test_macros.h b/test/support/test_macros.h
index 330d684..808f2b5 100644
--- a/test/support/test_macros.h
+++ b/test/support/test_macros.h
@@ -223,9 +223,8 @@
 #define TEST_SAFE_STATIC
 #endif
 
-// FIXME: Fix this feature check when either (A) a compiler provides a complete
-// implementation, or (b) a feature check macro is specified
-#if !defined(_MSC_VER) || defined(__clang__) || _MSC_VER < 1920 || _MSVC_LANG <= 201703L
+#if !defined(__cpp_impl_three_way_comparison) \
+    && (!defined(_MSC_VER) || defined(__clang__) || _MSC_VER < 1920 || _MSVC_LANG <= 201703L)
 #define TEST_HAS_NO_SPACESHIP_OPERATOR
 #endif