diff --git a/catch/include/hip_test_common.hh b/catch/include/hip_test_common.hh
index 774c7aa148..2ba1dddba3 100644
--- a/catch/include/hip_test_common.hh
+++ b/catch/include/hip_test_common.hh
@@ -148,17 +148,13 @@ static inline bool IsGfx11() {
   hipDeviceProp_t props{};
   HIP_CHECK(hipGetDevice(&device));
   HIP_CHECK(hipGetDeviceProperties(&props, device));
-
    // Get GCN Arch Name and compare to check if it is gfx11
   std::string arch = std::string(props.gcnArchName);
-  auto pos = arch.find(":");
+  auto pos = arch.find("gfx11");
   if (pos != std::string::npos)
-    arch = arch.substr(0, pos);
-
-  if(arch.size() >= 5)
-    arch = arch.substr(0,5);
-
-  return (arch == std::string("gfx11")) ? true : false;
+    return true;
+  else
+    return false;
 #else
   std::cout<<"Have to be either Nvidia or AMD platform, asserting"<<std::endl;
   assert(false);