diff --git a/c2h/include/c2h/catch2_test_helper.h b/c2h/include/c2h/catch2_test_helper.h
index fb0ff2c00a..3053872182 100644
--- a/c2h/include/c2h/catch2_test_helper.h
+++ b/c2h/include/c2h/catch2_test_helper.h
@@ -65,9 +65,9 @@
 #  undef CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
 #  undef CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
 #  undef CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS
-#  define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
-#  define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-#  define CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS
+#  define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION        _Pragma("diag push")
+#  define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION         _Pragma("diag push")
+#  define CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS _Pragma("diag_suppress 177")
 #endif
 
 #ifndef VAR_IDX
diff --git a/cudax/test/common/testing.cuh b/cudax/test/common/testing.cuh
index 3cd4dc7328..cc6725de89 100644
--- a/cudax/test/common/testing.cuh
+++ b/cudax/test/common/testing.cuh
@@ -37,8 +37,10 @@
 #if _CCCL_COMPILER(MSVC)
 #  undef CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
 #  undef CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-#  define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
-#  define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#  undef CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS
+#  define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION        _Pragma("diag push")
+#  define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION         _Pragma("diag push")
+#  define CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS _Pragma("diag_suppress 177")
 #endif
 
 namespace cuda::experimental::__async