diff --git a/projects/hip-tests/catch/hipTestMain/config/config_amd_linux b/projects/hip-tests/catch/hipTestMain/config/config_amd_linux
index 9780f08097..59c23e395f 100644
--- a/projects/hip-tests/catch/hipTestMain/config/config_amd_linux
+++ b/projects/hip-tests/catch/hipTestMain/config/config_amd_linux
@@ -771,7 +771,7 @@
         "=== SWDEV-443630 - Below tests failed in stress test on 19/01/23 ===",
         "Unit_hipGetSetDevice_MultiThreaded",
     #endif
-    #if defined gfx90a || defined  gfx940 || defined gfx941 || defined gfx942 || defined gfx950
+    #if defined gfx90a || defined gfx942 || defined gfx950
         "Unit_hipStreamPerThread_DeviceReset_1",
         "Unit_hipDeviceGetPCIBusId_Negative_PartialFill",
         "Unit_hipInit_Negative",
diff --git a/projects/hip-tests/catch/hipTestMain/hip_test_features.cc b/projects/hip-tests/catch/hipTestMain/hip_test_features.cc
index 2d0422f341..ecaef3f317 100644
--- a/projects/hip-tests/catch/hipTestMain/hip_test_features.cc
+++ b/projects/hip-tests/catch/hipTestMain/hip_test_features.cc
@@ -6,9 +6,9 @@
 #include "hip_test_context.hh"
 
 std::vector<std::unordered_set<std::string>> GCNArchFeatMap = {
-  {"gfx90a", "gfx940", "gfx941", "gfx942", "gfx950"},     // CT_FEATURE_FINEGRAIN_HWSUPPORT
-  {"gfx90a", "gfx940", "gfx941", "gfx942", "gfx950"},     // CT_FEATURE_HMM
-  {"gfx90a", "gfx940", "gfx941", "gfx942", "gfx950"},     // CT_FEATURE_TEXTURES_NOT_SUPPORTED
+  {"gfx90a", "gfx942", "gfx950"},     // CT_FEATURE_FINEGRAIN_HWSUPPORT
+  {"gfx90a", "gfx942", "gfx950"},     // CT_FEATURE_HMM
+  {"gfx90a", "gfx942", "gfx950"},     // CT_FEATURE_TEXTURES_NOT_SUPPORTED
 };
 
 #if HT_AMD
diff --git a/projects/hip-tests/catch/unit/atomics/CMakeLists.txt b/projects/hip-tests/catch/unit/atomics/CMakeLists.txt
index b19d4d2acc..1dbc59b090 100644
--- a/projects/hip-tests/catch/unit/atomics/CMakeLists.txt
+++ b/projects/hip-tests/catch/unit/atomics/CMakeLists.txt
@@ -55,41 +55,9 @@ if(HIP_PLATFORM MATCHES "amd")
       __hip_atomic_fetch_or.cc
       __hip_atomic_fetch_xor.cc
       __hip_atomic_exchange.cc
-    )
-
-  #atomicInc & atomicDec tests are disabled on gfx941 due to SWDEV-440688
-  set(NOT_FOR_GFX941_TEST
       atomicInc.cc
       atomicDec.cc
-  )
-  set(GFX941_TARGET gfx941)
-  function(CheckRejectedArchs OFFLOAD_ARCH_STR_LOCAL)
-    set(ARCH_CHECK -1 PARENT_SCOPE)
-    string(REGEX MATCHALL "--offload-arch=gfx[0-9a-z]+" OFFLOAD_ARCH_LIST ${OFFLOAD_ARCH_STR_LOCAL})
-    foreach(OFFLOAD_ARCH IN LISTS OFFLOAD_ARCH_LIST)
-      string(REGEX MATCHALL "--offload-arch=(gfx[0-9a-z]+)" matches ${OFFLOAD_ARCH})
-      if (CMAKE_MATCH_COUNT EQUAL 1)
-        if (CMAKE_MATCH_1 IN_LIST GFX941_TARGET)
-          set(ARCH_CHECK 1 PARENT_SCOPE)
-        endif()         # CMAKE_MATCH_1
-      endif()        # CMAKE_MATCH_COUNT
-    endforeach()   # OFFLOAD_ARCH_LIST
-  endfunction()  # CheckAcceptedArchs
-
-  if (DEFINED OFFLOAD_ARCH_STR)
-    CheckRejectedArchs(${OFFLOAD_ARCH_STR})
-  elseif(DEFINED $ENV{HCC_AMDGPU_TARGET})
-    CheckRejectedArchs($ENV{HCC_AMDGPU_TARGET})
-  else()
-    set(ARCH_CHECK -1)
-  endif()
-  if(${ARCH_CHECK} EQUAL -1)
-    message(STATUS "Adding test: ${NOT_FOR_GFX941_TEST}")
-    set(TEST_SRC ${TEST_SRC} ${NOT_FOR_GFX941_TEST})
-  else()
-    message(STATUS "Removing test: ${NOT_FOR_GFX941_TEST}")
-  endif()
-
+    )
 
   hip_add_exe_to_target(NAME AtomicsTest
                         TEST_SRC ${TEST_SRC}
diff --git a/projects/hip-tests/catch/unit/deviceLib/AtomicAdd_Coherent_withnoUnsafeflag.cc b/projects/hip-tests/catch/unit/deviceLib/AtomicAdd_Coherent_withnoUnsafeflag.cc
index 26d3f1cfed..ffc1bdea93 100644
--- a/projects/hip-tests/catch/unit/deviceLib/AtomicAdd_Coherent_withnoUnsafeflag.cc
+++ b/projects/hip-tests/catch/unit/deviceLib/AtomicAdd_Coherent_withnoUnsafeflag.cc
@@ -22,7 +22,7 @@
 AtomicAdd on FineGrainMemory
 1. The following test scenario verifies
 atomicAdd on fineGrain memory with -mno-unsafe-atomics flag
-This testcase works only on gfx90a, gfx940, gfx941, gfx942, gfx950.
+This testcase works only on gfx90a, gfx942, gfx950.
 */
 
 #include <hip_test_checkers.hh>
@@ -88,7 +88,7 @@ TEMPLATE_TEST_CASE("Unit_AtomicAdd_Coherentwithnounsafeflag", "",
       HIP_CHECK(hipHostFree(result));
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
         "Hence skipping the testcase for this GPU " << device);
   }
 }
diff --git a/projects/hip-tests/catch/unit/deviceLib/AtomicAdd_Coherent_withoutflag.cc b/projects/hip-tests/catch/unit/deviceLib/AtomicAdd_Coherent_withoutflag.cc
index 270ff42462..9178efb714 100644
--- a/projects/hip-tests/catch/unit/deviceLib/AtomicAdd_Coherent_withoutflag.cc
+++ b/projects/hip-tests/catch/unit/deviceLib/AtomicAdd_Coherent_withoutflag.cc
@@ -22,7 +22,7 @@
 AtomicAdd on FineGrainMemory
 1. The following test scenario verifies
 atomicAdd on fineGrain memory without any unsafeatomics flag
-This testcase works only on gfx90a, gfx940, gfx941, gfx942, gfx950.
+This testcase works only on gfx90a, gfx942, gfx950.
 */
 
 #include<hip_test_checkers.hh>
@@ -85,7 +85,7 @@ TEMPLATE_TEST_CASE("Unit_AtomicAdd_Coherentwithoutflag", "",
       HIP_CHECK(hipHostFree(result));
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
         "Hence skipping the testcase for this GPU " << device);
   }
 }
diff --git a/projects/hip-tests/catch/unit/deviceLib/AtomicAdd_Coherent_withunsafeflag.cc b/projects/hip-tests/catch/unit/deviceLib/AtomicAdd_Coherent_withunsafeflag.cc
index 1b0ab78ffd..45098487df 100644
--- a/projects/hip-tests/catch/unit/deviceLib/AtomicAdd_Coherent_withunsafeflag.cc
+++ b/projects/hip-tests/catch/unit/deviceLib/AtomicAdd_Coherent_withunsafeflag.cc
@@ -22,7 +22,7 @@
 AtomicAdd on FineGrainMemory
 1. The following test scenario verifies
 atomicAdd on fineGrain memory with -munsafe-fp-atomics flag
-This testcase works only on gfx90a, gfx940, gfx941, gfx942, gfx950.
+This testcase works only on gfx90a, gfx942, gfx950.
 */
 
 #include<hip_test_checkers.hh>
@@ -99,7 +99,7 @@ TEMPLATE_TEST_CASE("Unit_AtomicAdd_CoherentwithUnsafeflag", "",
       HIP_CHECK(hipHostFree(result));
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
         "Hence skipping the testcase for this GPU " << device);
   }
 }
diff --git a/projects/hip-tests/catch/unit/deviceLib/AtomicAdd_NonCoherent_withnoUnsafeflag.cc b/projects/hip-tests/catch/unit/deviceLib/AtomicAdd_NonCoherent_withnoUnsafeflag.cc
index 7f548ebc5a..67adccdf98 100644
--- a/projects/hip-tests/catch/unit/deviceLib/AtomicAdd_NonCoherent_withnoUnsafeflag.cc
+++ b/projects/hip-tests/catch/unit/deviceLib/AtomicAdd_NonCoherent_withnoUnsafeflag.cc
@@ -22,7 +22,7 @@
 AtomicAdd on CoarseGrainMemory
 1. The following test scenario verifies
 atomicAdd on CoarseGrain memory with -mno-unsafe-atomics flag
-This testcase works only on gfx90a, gfx940, gfx941, gfx942, gfx950.
+This testcase works only on gfx90a, gfx942, gfx950.
 */
 
 #include<hip_test_checkers.hh>
@@ -86,7 +86,7 @@ TEMPLATE_TEST_CASE("Unit_AtomicAdd_NonCoherentwithnounsafeflag", "",
       HIP_CHECK(hipHostFree(result));
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
         "Hence skipping the testcase for this GPU " << device);
   }
 }
diff --git a/projects/hip-tests/catch/unit/deviceLib/AtomicAdd_NonCoherent_withoutflag.cc b/projects/hip-tests/catch/unit/deviceLib/AtomicAdd_NonCoherent_withoutflag.cc
index d610ce4439..134b7adcfa 100644
--- a/projects/hip-tests/catch/unit/deviceLib/AtomicAdd_NonCoherent_withoutflag.cc
+++ b/projects/hip-tests/catch/unit/deviceLib/AtomicAdd_NonCoherent_withoutflag.cc
@@ -22,7 +22,7 @@
 AtomicAdd on CoarseGrainMemory
 1. The following test scenario verifies
 atomicAdd on CoarseGrain memory without any unsafeatomics flag
-This testcase works only on gfx90a, gfx940, gfx941, gfx942, gfx950.
+This testcase works only on gfx90a, gfx942, gfx950.
 */
 
 #include<hip_test_checkers.hh>
@@ -87,7 +87,7 @@ TEMPLATE_TEST_CASE("Unit_AtomicAdd_NonCoherentwithoutflag", "",
       HIP_CHECK(hipHostFree(result));
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
         "Hence skipping the testcase for this GPU " << device);
   }
 }
diff --git a/projects/hip-tests/catch/unit/deviceLib/AtomicAdd_NonCoherent_withunsafeflag.cc b/projects/hip-tests/catch/unit/deviceLib/AtomicAdd_NonCoherent_withunsafeflag.cc
index 50d92d1c2b..2bdd1218a5 100644
--- a/projects/hip-tests/catch/unit/deviceLib/AtomicAdd_NonCoherent_withunsafeflag.cc
+++ b/projects/hip-tests/catch/unit/deviceLib/AtomicAdd_NonCoherent_withunsafeflag.cc
@@ -22,7 +22,7 @@
 AtomicAdd on CoarseGrainMemory
 1. The following test scenario verifies
 atomicAdd on CoarseGrain memory with -munsafe-fp-atomics flag
-This testcase works only on gfx90a, gfx940, gfx941, gfx942, gfx950.
+This testcase works only on gfx90a, gfx942, gfx950.
 */
 
 #include<hip_test_checkers.hh>
@@ -93,7 +93,7 @@ TEMPLATE_TEST_CASE("Unit_AtomicAdd_NonCoherentwithUnsafeflag", "",
       HIP_CHECK(hipHostFree(result));
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
         "Hence skipping the testcase for this GPU " << device);
   }
 }
diff --git a/projects/hip-tests/catch/unit/deviceLib/BuiltIns_fadd.cc b/projects/hip-tests/catch/unit/deviceLib/BuiltIns_fadd.cc
index 8ed2dfb1a9..8733ac422f 100644
--- a/projects/hip-tests/catch/unit/deviceLib/BuiltIns_fadd.cc
+++ b/projects/hip-tests/catch/unit/deviceLib/BuiltIns_fadd.cc
@@ -91,7 +91,7 @@ TEST_CASE("Unit_BuiltInAtomicAdd_CoherentGlobalMem") {
       HIP_CHECK(hipFree(result));
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
         "Hence skipping the testcase for this GPU " << device);
   }
 }
@@ -135,7 +135,7 @@ TEST_CASE("Unit_BuiltInAtomicAdd_NonCoherentGlobalMem") {
       free(B_h);
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950"
             "Hence skipping the testcase for GPU-0");
   }
 }
@@ -219,7 +219,7 @@ TEST_CASE("Unit_BuiltInAtomicAdd_CoherentGlobalMemWithRtc") {
       free(B_h);
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
         "Hence skipping the testcase for this GPU " << device);
   }
 }
@@ -299,7 +299,7 @@ TEST_CASE("Unit_BuiltInAtomicAdd_NonCoherentGlobalMemWithRtc") {
       free(B_h);
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
         "Hence skipping the testcase for this GPU " << device);
   }
 }
diff --git a/projects/hip-tests/catch/unit/deviceLib/CMakeLists.txt b/projects/hip-tests/catch/unit/deviceLib/CMakeLists.txt
index 37774d4965..3a6534724e 100644
--- a/projects/hip-tests/catch/unit/deviceLib/CMakeLists.txt
+++ b/projects/hip-tests/catch/unit/deviceLib/CMakeLists.txt
@@ -152,8 +152,8 @@ set_property(GLOBAL APPEND PROPERTY G_INSTALL_CUSTOM_TARGETS ${CMAKE_CURRENT_BIN
 set_property(GLOBAL APPEND PROPERTY G_INSTALL_CUSTOM_TARGETS ${CMAKE_CURRENT_BINARY_DIR}/kerDevAllocMultCO.code)
 
 # Accepted archs to compile this cmake file
-set(ACCEPTED_OFFLOAD_ARCHS gfx90a gfx940 gfx941 gfx942)
-set(ACCEPTED_GFX940_ARCH gfx940 gfx941 gfx942)
+set(ACCEPTED_OFFLOAD_ARCHS gfx90a gfx942)
+set(ACCEPTED_GFX940_ARCH gfx942)
 set(ACCEPTED_GFX1200_ARCH gfx1200 gfx1201)
 function(CheckAcceptedArchs OFFLOAD_ARCH_STR_LOCAL)
   set(ARCH_CHECK -1 PARENT_SCOPE)
diff --git a/projects/hip-tests/catch/unit/deviceLib/fp8_fnuz.cc b/projects/hip-tests/catch/unit/deviceLib/fp8_fnuz.cc
index 2d3d080666..08d66f3ceb 100644
--- a/projects/hip-tests/catch/unit/deviceLib/fp8_fnuz.cc
+++ b/projects/hip-tests/catch/unit/deviceLib/fp8_fnuz.cc
@@ -26,13 +26,13 @@ THE SOFTWARE.
 #include <type_traits>
 #include <vector>
 #include <bitset>
-#if defined(__gfx940__) || defined(__gfx941__) || defined(__gfx942__)
+#ifdef __gfx942__
 #define __gfx94plus_local__
 #endif
 
 /*
 * This catch test is meant for FP8 FNUZ conversion checking
-* tests only supported on gfx940,gfx941,gfx942 archs.
+* tests only supported on gfx942 archs.
 */
 
 static_assert(sizeof(unsigned int) == sizeof(float));
@@ -47,14 +47,12 @@ std::string get_arch_type()  {
 }
 
 #define ARCH_TYPE_GFX940(name) \
-  (name.find("gfx940") != std::string::npos) || \
-  (name.find("gfx941") != std::string::npos) || \
   (name.find("gfx942") != std::string::npos)
 
 #define FP8_FNUZ_SKIP_TEST \
   std::string gfxName = get_arch_type(); \
   if (!(ARCH_TYPE_GFX940(gfxName))) { \
-    HipTest::HIP_SKIP_TEST("This test can only be run on gfx940,gfx941,gfx42 arch"); \
+    HipTest::HIP_SKIP_TEST("This test can only be run on gfx942 arch"); \
     return; \
   }
 
diff --git a/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_Coherent_withnounsafeflag.cc b/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_Coherent_withnounsafeflag.cc
index 9775770d88..34c84f519b 100644
--- a/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_Coherent_withnounsafeflag.cc
+++ b/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_Coherent_withnounsafeflag.cc
@@ -22,7 +22,7 @@
 AtomicAdd on FineGrainMemory
 1. The following test scenario verifies
 unsafeatomicAdd on fineGrain memory with -mno-unsafe-fp-atomics flag
-This testcase works only on gfx90a, gfx940, gfx941, gfx942, gfx950.
+This testcase works only on gfx90a, gfx942, gfx950.
 */
 
 #include<hip_test_common.hh>
@@ -100,7 +100,7 @@ TEMPLATE_TEST_CASE("Unit_unsafeAtomicAdd_CoherentwithnoUnsafeflag", "",
       HIP_CHECK(hipHostFree(result));
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
         "Hence skipping the testcase for this GPU " << device);
   }
 }
diff --git a/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_Coherent_withoutflag.cc b/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_Coherent_withoutflag.cc
index ed79bcc02e..8d98bb4a79 100644
--- a/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_Coherent_withoutflag.cc
+++ b/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_Coherent_withoutflag.cc
@@ -22,7 +22,7 @@
 AtomicAdd on FineGrainMemory
 1. The following test scenario verifies
 unsafeatomicAdd on fineGrain memory without atomics flag
-This testcase works only on gfx90a, gfx940, gfx941, gfx942, gfx950.
+This testcase works only on gfx90a, gfx942, gfx950.
 */
 
 #include<hip_test_checkers.hh>
@@ -100,7 +100,7 @@ TEMPLATE_TEST_CASE("Unit_unsafeAtomicAdd_Coherentwithoutflag", "",
       HIP_CHECK(hipHostFree(result));
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
         "Hence skipping the testcase for this GPU " << device);
   }
 }
diff --git a/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_Coherent_withunsafeflag.cc b/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_Coherent_withunsafeflag.cc
index d1b117d115..dc3eef7db5 100644
--- a/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_Coherent_withunsafeflag.cc
+++ b/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_Coherent_withunsafeflag.cc
@@ -101,7 +101,7 @@ TEMPLATE_TEST_CASE("Unit_unsafeAtomicAdd_CoherentwithUnsafeflag", "",
       HIP_CHECK(hipHostFree(result));
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, Hence"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, Hence"
              "skipping the testcase for this GPU " << device);
   }
 }
diff --git a/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_NonCoherent_withnounsafeflag.cc b/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_NonCoherent_withnounsafeflag.cc
index 01a75aba20..6dc81d52f9 100644
--- a/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_NonCoherent_withnounsafeflag.cc
+++ b/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_NonCoherent_withnounsafeflag.cc
@@ -22,7 +22,7 @@
 AtomicAdd on CoarseGrainMemory
 1. The following test scenario verifies
 unsafeAtomicAdd on CoarseGrain memory with -mno-unsafe-fp-atomics flag
-This testcase works only on gfx90a, gfx940, gfx941, gfx942, gfx950.
+This testcase works only on gfx90a, gfx942, gfx950.
 */
 
 #include<hip_test_checkers.hh>
@@ -93,7 +93,7 @@ TEMPLATE_TEST_CASE("Unit_unsafeAtomicAdd_NonCoherentnounsafeatomicsflag", "",
       HIP_CHECK(hipHostFree(result));
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950, "
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950, "
         "Hence skipping the testcase for this GPU " << device);
   }
 }
diff --git a/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_NonCoherent_withoutflag.cc b/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_NonCoherent_withoutflag.cc
index b7824af297..b7e05ef640 100644
--- a/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_NonCoherent_withoutflag.cc
+++ b/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_NonCoherent_withoutflag.cc
@@ -22,7 +22,7 @@
 unsafeAtomicAdd on CoarseGrainMemory
 1. The following test scenario verifies
 unsafeAtomicAdd on CoarseGrain memory without any unsafeatomics flag
-This testcase works only on gfx90a, gfx940, gfx941, gfx942, gfx950.
+This testcase works only on gfx90a, gfx942, gfx950.
 */
 
 #include<hip_test_checkers.hh>
@@ -93,7 +93,7 @@ TEMPLATE_TEST_CASE("Unit_unsafeAtomicAdd_NonCoherentwithoutflag", "",
       HIP_CHECK(hipHostFree(result));
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
         "Hence skipping the testcase for this GPU " << device);
   }
 }
diff --git a/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_NonCoherent_withunsafeflag.cc b/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_NonCoherent_withunsafeflag.cc
index 093ff069d4..b0f02c3489 100644
--- a/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_NonCoherent_withunsafeflag.cc
+++ b/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_NonCoherent_withunsafeflag.cc
@@ -22,7 +22,7 @@
 unsafeAtomicAdd on CoarseGrainMemory
 1. The following test scenario verifies
 unsafeAtomicAdd on CoarseGrain memory with unsafeatomics flag
-This testcase works only on gfx90a, gfx940, gfx941, gfx942, gfx950.
+This testcase works only on gfx90a, gfx942, gfx950.
 */
 
 #include<hip_test_checkers.hh>
@@ -93,7 +93,7 @@ TEMPLATE_TEST_CASE("Unit_unsafeAtomicAdd_NonCoherentwithunsafeatomicsflag", "",
       HIP_CHECK(hipHostFree(result));
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
         "Hence skipping the testcase for this GPU " << device);
   }
 }
diff --git a/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_RTC.cc b/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_RTC.cc
index 69aa086ee4..a2ed3f24d2 100644
--- a/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_RTC.cc
+++ b/projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_RTC.cc
@@ -141,7 +141,7 @@ TEMPLATE_TEST_CASE("Unit_unsafeAtomicAdd_CoherentRTCnounsafeatomicflag", "",
     }
     HIP_CHECK(hipModuleUnload(module));
   } else {
-      SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+      SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
           "Hence skipping the testcase for this GPU " << device);
   }
 }
@@ -238,7 +238,7 @@ TEMPLATE_TEST_CASE("Unit_unsafeAtomicAdd_CoherentRTCunsafeatomicflag", "",
     }
     HIP_CHECK(hipModuleUnload(module));
   } else {
-      SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+      SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
           "Hence skipping the testcase for this GPU " << device);
   }
 }
@@ -331,7 +331,7 @@ TEMPLATE_TEST_CASE("Unit_unsafeAtomicAdd_CoherentRTCwithoutflag", "",
     }
     HIP_CHECK(hipModuleUnload(module));
   } else {
-      SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+      SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
           "Hence skipping the testcase for this GPU " << device);
   }
 }
@@ -417,7 +417,7 @@ TEMPLATE_TEST_CASE("Unit_unsafeAtomicAdd_NonCoherentRTCnounsafeatomicflag", "",
     }
     HIP_CHECK(hipModuleUnload(module));
   } else {
-      SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+      SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
           "Hence skipping the testcase for this GPU " << device);
   }
 }
@@ -505,7 +505,7 @@ TEMPLATE_TEST_CASE("Unit_unsafeAtomicAdd_NonCoherentRTCunsafeatomicflag", "",
     }
     HIP_CHECK(hipModuleUnload(module));
   } else {
-      SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+      SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
           "Hence skipping the testcase for this GPU " << device);
   }
 }
@@ -593,7 +593,7 @@ TEMPLATE_TEST_CASE("Unit_unsafeAtomicAdd_NonCoherentRTC", "",
     }
     HIP_CHECK(hipModuleUnload(module));
   } else {
-      SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+      SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
           "Hence skipping the testcase for this GPU " << device);
   }
 }
diff --git a/projects/hip-tests/catch/unit/memory/CMakeLists.txt b/projects/hip-tests/catch/unit/memory/CMakeLists.txt
index 6a783af5e1..06eba3c970 100644
--- a/projects/hip-tests/catch/unit/memory/CMakeLists.txt
+++ b/projects/hip-tests/catch/unit/memory/CMakeLists.txt
@@ -207,7 +207,7 @@ if(HIP_PLATFORM MATCHES "amd")
 endif()
 
 set(NOT_FOR_gfx90a_AND_ABOVE_TEST hipMallocArray.cc hipArrayCreate.cc) # tests not for gfx90a+
-set(gfx90a_AND_ABOVE_TARGETS gfx90a gfx940 gfx941 gfx942 gfx950)
+set(gfx90a_AND_ABOVE_TARGETS gfx90a gfx942 gfx950)
 function(CheckRejectedArchs OFFLOAD_ARCH_STR_LOCAL)
   set(ARCH_CHECK -1 PARENT_SCOPE)
   set(NOT_GFX90a -1)
diff --git a/projects/hip-tests/catch/unit/texture/CMakeLists.txt b/projects/hip-tests/catch/unit/texture/CMakeLists.txt
index 9ca6024512..0e363d9743 100644
--- a/projects/hip-tests/catch/unit/texture/CMakeLists.txt
+++ b/projects/hip-tests/catch/unit/texture/CMakeLists.txt
@@ -82,7 +82,7 @@ set(NOT_FOR_gfx90a_AND_ABOVE_TEST
     tex3DGrad.cc
 )
 
-set(gfx90a_AND_ABOVE_TARGETS gfx90a gfx940 gfx941 gfx942 gfx950)
+set(gfx90a_AND_ABOVE_TARGETS gfx90a gfx942 gfx950)
 function(CheckRejectedArchs OFFLOAD_ARCH_STR_LOCAL)
   set(ARCH_CHECK -1 PARENT_SCOPE)
   string(REGEX MATCHALL "--offload-arch=gfx[0-9a-z]+" OFFLOAD_ARCH_LIST ${OFFLOAD_ARCH_STR_LOCAL})