diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 79a031c..f37bef5 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -237,7 +237,9 @@ else()
         -Wextra
         -Wpedantic
         -Wshadow
-        -Wsign-conversion
+        $<$<NOT:$<AND:$<BOOL:${CMAKE_CXX_STANDARD}>, $<EQUAL:${CMAKE_CXX_STANDARD},20>>>:
+           -Wsign-conversion                                                                   # happens to trigger on googletest
+        >
         $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:
           -Weverything
           -Wno-c++98-compat
@@ -245,12 +247,6 @@ else()
           -Wno-missing-prototypes
           -Wno-unknown-attributes
           -Wno-weak-vtables
-          $<$<BOOL:${CMAKE_CXX_STANDARD}>:
-            $<$<EQUAL:${CMAKE_CXX_STANDARD},20>:
-                -Wzero-as-null-pointer-constant- # Very noisy, minor, and just so
-                -Wsign-conversion-                                                                   # happens to trigger on googletest
-            >
-          >
         >
         $<$<CXX_COMPILER_ID:GNU>:
           -Wdouble-promotion # float implicit to double