diff --git a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_equal/cmp_equal.pass.cpp b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_equal/cmp_equal.pass.cpp
--- a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_equal/cmp_equal.pass.cpp
+++ b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_equal/cmp_equal.pass.cpp
@@ -89,9 +89,7 @@
 
 constexpr bool test() {
   std::tuple<
-#ifndef TEST_HAS_NO_INT128
-      __int128_t, __uint128_t,
-#endif
+      TEST_IF_INT128(__int128_t, __uint128_t,)
       unsigned long long, long long, unsigned long, long, unsigned int, int,
       unsigned short, short, unsigned char, signed char> types;
   test1(types);
diff --git a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_greater/cmp_greater.pass.cpp b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_greater/cmp_greater.pass.cpp
--- a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_greater/cmp_greater.pass.cpp
+++ b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_greater/cmp_greater.pass.cpp
@@ -80,9 +80,7 @@
 
 constexpr bool test() {
   std::tuple<
-#ifndef TEST_HAS_NO_INT128
-      __int128_t, __uint128_t,
-#endif
+      TEST_IF_INT128(__int128_t, __uint128_t,)
       unsigned long long, long long, unsigned long, long, unsigned int, int,
       unsigned short, short, unsigned char, signed char> types;
   test1(types);
diff --git a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_greater_equal/cmp_greater_equal.pass.cpp b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_greater_equal/cmp_greater_equal.pass.cpp
--- a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_greater_equal/cmp_greater_equal.pass.cpp
+++ b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_greater_equal/cmp_greater_equal.pass.cpp
@@ -82,9 +82,7 @@
 
 constexpr bool test() {
   std::tuple<
-#ifndef TEST_HAS_NO_INT128
-      __int128_t, __uint128_t,
-#endif
+      TEST_IF_INT128(__int128_t, __uint128_t,)
       unsigned long long, long long, unsigned long, long, unsigned int, int,
       unsigned short, short, unsigned char, signed char> types;
   test1(types);
diff --git a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_less/cmp_less.pass.cpp b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_less/cmp_less.pass.cpp
--- a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_less/cmp_less.pass.cpp
+++ b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_less/cmp_less.pass.cpp
@@ -81,9 +81,7 @@
 
 constexpr bool test() {
   std::tuple<
-#ifndef TEST_HAS_NO_INT128
-      __int128_t, __uint128_t,
-#endif
+      TEST_IF_INT128(__int128_t, __uint128_t,)
       unsigned long long, long long, unsigned long, long, unsigned int, int,
       unsigned short, short, unsigned char, signed char> types;
   test1(types);
diff --git a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_less_equal/cmp_less_equal.pass.cpp b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_less_equal/cmp_less_equal.pass.cpp
--- a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_less_equal/cmp_less_equal.pass.cpp
+++ b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_less_equal/cmp_less_equal.pass.cpp
@@ -81,9 +81,7 @@
 
 constexpr bool test() {
   std::tuple<
-#ifndef TEST_HAS_NO_INT128
-      __int128_t, __uint128_t,
-#endif
+      TEST_IF_INT128(__int128_t, __uint128_t,)
       unsigned long long, long long, unsigned long, long, unsigned int, int,
       unsigned short, short, unsigned char, signed char> types;
   test1(types);
diff --git a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_not_equal/cmp_not_equal.pass.cpp b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_not_equal/cmp_not_equal.pass.cpp
--- a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_not_equal/cmp_not_equal.pass.cpp
+++ b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.cmp_not_equal/cmp_not_equal.pass.cpp
@@ -88,9 +88,7 @@
 
 constexpr bool test() {
   std::tuple<
-#ifndef TEST_HAS_NO_INT128
-      __int128_t, __uint128_t,
-#endif
+      TEST_IF_INT128(__int128_t, __uint128_t,)
       unsigned long long, long long, unsigned long, long, unsigned int, int,
       unsigned short, short, unsigned char, signed char> types;
   test1(types);
diff --git a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.in_range/in_range.pass.cpp b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.in_range/in_range.pass.cpp
--- a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.in_range/in_range.pass.cpp
+++ b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.in_range/in_range.pass.cpp
@@ -64,9 +64,7 @@
 
 constexpr bool test() {
   std::tuple<
-#ifndef TEST_HAS_NO_INT128
-      __int128_t, __uint128_t,
-#endif
+      TEST_IF_INT128(__int128_t, __uint128_t,)
       unsigned long long, long long, unsigned long, long, unsigned int, int,
       unsigned short, short, unsigned char, signed char> types;
   test1(types);
diff --git a/libcxx/test/support/test_macros.h b/libcxx/test/support/test_macros.h
--- a/libcxx/test/support/test_macros.h
+++ b/libcxx/test/support/test_macros.h
@@ -370,6 +370,9 @@
 
 #if defined(_LIBCPP_HAS_NO_INT128) || defined(TEST_COMPILER_MSVC)
 #   define TEST_HAS_NO_INT128
+#   define TEST_IF_INT128(...)
+#else
+#   define TEST_IF_INT128(...) __VA_ARGS__
 #endif
 
 #if defined(_LIBCPP_HAS_NO_UNICODE_CHARS)