diff --git a/test/handle_test.cpp b/test/handle_test.cpp
index ba143d7ad1..16ce78f043 100644
--- a/test/handle_test.cpp
+++ b/test/handle_test.cpp
@@ -29,12 +29,11 @@
 #define WORKAROUND_SWDEV_257056_PCH_MISSING_MACROS 1
 
 // https://gerrit-git.amd.com/c/compute/ec/clr/+/972441
-// "HIP_PACKAGE_VERSION_FLAT == 6001000000ULL" is for ROCm 6.1 RC where issue #2600 is not
-// yet fixed in the compiler. In order to test such release candidates, we have to
-// override HIP version to 6.1.0.
+// Issue #2600 is not fixed in 6.0 and still persists in 6.1 release candidates.
+// We are expecting it to be fixed in 6.1 RC after week 4 in 2024.
 #define WORKAROUND_ISSUE_2600                                                                    \
     ((HIP_PACKAGE_VERSION_FLAT >= 6000000000ULL && HIP_PACKAGE_VERSION_FLAT <= 6000999999ULL) || \
-     HIP_PACKAGE_VERSION_FLAT == 6001000000ULL)
+     (HIP_PACKAGE_VERSION_FLAT >= 6001000000ULL && HIP_PACKAGE_VERSION_FLAT <= 6001024049ULL))
 
 #include <miopen/config.h>
 #include <miopen/handle.hpp>