diff --git a/cub/test/catch2_test_device_for_each_in_extents.cu b/cub/test/catch2_test_device_for_each_in_extents.cu
index f7f6bb1c5c3..d53354b9fc2 100644
--- a/cub/test/catch2_test_device_for_each_in_extents.cu
+++ b/cub/test/catch2_test_device_for_each_in_extents.cu
@@ -26,9 +26,9 @@
  ******************************************************************************/
 #include <cub/config.cuh>
 
-// TODO: remove _CCCL_COMPILER(MSVC) check after MSVC bug related to vector comparison is fixed:
-//       "error C3546: '...': there are no parameter packs available to expand"
-#if __cccl_lib_mdspan
+// MSVC in C++20 is not able to compile Catch2 tests with many large type lists. Error:
+// error C3546: '...': there are no parameter packs available to expand in make_tuple_types.h:__make_tuple_types_flat
+#if !(_CCCL_COMPILER(MSVC) && _CCCL_STD_VERSION == 2020)
 
 #  include <cub/device/device_for.cuh>
 
@@ -181,4 +181,4 @@ C2H_TEST("DeviceForEachInExtents 3D dynamic", "[ForEachInExtents][dynamic][devic
   REQUIRE(h_output == h_output_gpu);
 }
 
-#endif // __cccl_lib_mdspan
+#endif // !(_CCCL_COMPILER(MSVC) && _CCCL_STD_VERSION == 2020)