diff --git a/projects/rccl-tests/verifiable/verifiable.cu b/projects/rccl-tests/verifiable/verifiable.cu
index b845bd99e93..a02f648befe 100644
--- a/projects/rccl-tests/verifiable/verifiable.cu
+++ b/projects/rccl-tests/verifiable/verifiable.cu
@@ -396,7 +396,7 @@ struct FloatLayout<hip_bfloat16> {
 };
 #endif
 #if RCCL_FLOAT8 == 1
-#if __HIP_DEVICE_COMPILE__ || HIP_VERSION < 60300000
+#if __HIP_DEVICE_COMPILE__ || (HIP_VERSION >= 60200000 && HIP_VERSION < 60300000)
 template<>
 struct FloatLayout<rccl_float8> {
   static constexpr bool is_floating_point = true;
@@ -996,7 +996,7 @@ cudaError_t prepareInput1(
   #if HAVE_ncclBfloat16
   case ncclBfloat16: fn = (void const*)&prepareInput2<hip_bfloat16, ReduceOp>; break;
   #endif
-  #if HAVE_ncclfp8_DEVICE || HIP_VERSION < 60300000
+  #if HAVE_ncclfp8_DEVICE || (HIP_VERSION >= 60200000 && HIP_VERSION < 60300000)
   case ncclFloat8e4m3: fn = (void const*)&prepareInput2<rccl_float8, ReduceOp>; break;
   case ncclFloat8e5m2: fn = (void const*)&prepareInput2<rccl_bfloat8, ReduceOp>; break;
   #elif HAVE_ncclfp8_HOST
@@ -1159,7 +1159,7 @@ cudaError_t prepareExpected1(
   #if HAVE_ncclBfloat16
   case ncclBfloat16: fn = (void const*)&prepareExpected2<hip_bfloat16, ReduceOp>; break;
   #endif
-  #if HAVE_ncclfp8_DEVICE || HIP_VERSION < 60300000 //for backward compatibility
+  #if HAVE_ncclfp8_DEVICE || (HIP_VERSION >= 60200000 && HIP_VERSION < 60300000)
   case ncclFloat8e4m3: fn = (void const*)&prepareExpected2<rccl_float8, ReduceOp>; break;
   case ncclFloat8e5m2: fn = (void const*)&prepareExpected2<rccl_bfloat8, ReduceOp>; break;
   #elif HAVE_ncclfp8_HOST
@@ -1394,7 +1394,7 @@ hipError_t ncclVerifiableVerify(
   #if HAVE_ncclBfloat16
   case ncclBfloat16: CASE_TY(hip_bfloat16, uint16_t)
   #endif
-  #if HAVE_ncclfp8_DEVICE || HIP_VERSION < 60300000
+  #if HAVE_ncclfp8_DEVICE || (HIP_VERSION >= 60200000 && HIP_VERSION < 60300000)
   case ncclFloat8e4m3: CASE_TY(rccl_float8, uint8_t)
   case ncclFloat8e5m2: CASE_TY(rccl_bfloat8, uint8_t)
   #elif HAVE_ncclfp8_HOST