diff --git a/ext/testlib/configuration.py b/ext/testlib/configuration.py
index 60c0c17654..cebf493add 100644
--- a/ext/testlib/configuration.py
+++ b/ext/testlib/configuration.py
@@ -245,7 +245,6 @@ def define_constants(constants):
 
     constants.isa_tag_type = "isa"
     constants.x86_tag = "X86"
-    constants.gcn3_x86_tag = "GCN3_X86"
     constants.vega_x86_tag = "VEGA_X86"
     constants.sparc_tag = "SPARC"
     constants.riscv_tag = "RISCV"
@@ -274,7 +273,6 @@ def define_constants(constants):
     constants.supported_tags = {
         constants.isa_tag_type: (
             constants.x86_tag,
-            constants.gcn3_x86_tag,
             constants.vega_x86_tag,
             constants.sparc_tag,
             constants.riscv_tag,
@@ -305,7 +303,6 @@ def define_constants(constants):
     constants.target_host = {
         constants.arm_tag: (constants.host_arm_tag,),
         constants.x86_tag: (constants.host_x86_64_tag,),
-        constants.gcn3_x86_tag: (constants.host_x86_64_tag,),
         constants.vega_x86_tag: (constants.host_x86_64_tag,),
         constants.sparc_tag: (constants.host_x86_64_tag,),
         constants.riscv_tag: (constants.host_x86_64_tag,),
diff --git a/tests/deprecated/compiler-tests.sh b/tests/deprecated/compiler-tests.sh
index e8da335de4..1af1878cf7 100755
--- a/tests/deprecated/compiler-tests.sh
+++ b/tests/deprecated/compiler-tests.sh
@@ -46,7 +46,6 @@ builds=("ALL"
         "ARM_MESI_Three_Level_HTM"
         "ARM_MOESI_hammer"
         "Garnet_standalone"
-        "GCN3_X86"
         "MIPS"
         "NULL"
         "NULL_MESI_Two_Level"
@@ -56,7 +55,6 @@ builds=("ALL"
         "POWER"
         "RISCV"
         "SPARC"
-        "GCN3_X86"
         "VEGA_X86"
         "X86"
         "X86_MI_example"
diff --git a/tests/deprecated/nightly.sh b/tests/deprecated/nightly.sh
index 53ad374c3c..e0899cad08 100755
--- a/tests/deprecated/nightly.sh
+++ b/tests/deprecated/nightly.sh
@@ -54,13 +54,13 @@ if [[ $# -gt 1 ]]; then
 fi
 
 # The third argument is the GPU ISA to run. If no argument is given we default
-# to GCN3_X86.
-gpu_isa=GCN3_X86
+# to VEGA_X86.
+gpu_isa=VEGA_X86
 if [[ $# -gt 2 ]]; then
     gpu_isa=$3
 fi
 
-if [[ "$gpu_isa" != "GCN3_X86" ]] && [[ "$gpu_isa" != "VEGA_X86" ]]; then
+if [[ "$gpu_isa" != "VEGA_X86" ]]; then
     echo "Invalid GPU ISA: $gpu_isa"
     exit 1
 fi
diff --git a/tests/deprecated/weekly.sh b/tests/deprecated/weekly.sh
index 17d68426a6..d45d31eb25 100755
--- a/tests/deprecated/weekly.sh
+++ b/tests/deprecated/weekly.sh
@@ -42,10 +42,10 @@ tag="latest"
 # We assume the first three arguments are the number of threads to use for
 # compilation followed by the GPU ISA to test, and finally, the number of
 # "run threads", the maximum number of tests to be run at once. By default the
-# number of compile threads 1 and the GPU ISA is GCN3_X86. The number of
+# number of compile threads 1 and the GPU ISA is VEGA_X86. The number of
 # "run threads" is equal to the number of compile threads by default.
 threads=1
-gpu_isa=GCN3_X86
+gpu_isa=VEGA_X86
 run_threads=1
 if [[ $# -eq 1 ]]; then
     threads=$1
@@ -64,7 +64,7 @@ else
     fi
 fi
 
-if [[ "$gpu_isa" != "GCN3_X86" ]] && [[ "$gpu_isa" != "VEGA_X86" ]]; then
+if [[ "$gpu_isa" != "VEGA_X86" ]]; then
     echo "Invalid GPU ISA: $gpu_isa"
     exit 1
 fi
@@ -170,13 +170,13 @@ docker run --rm -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \
      --memory="${docker_mem_limit}" hacc-test-weekly bash -c \
      "make -j${threads}"
 
-# generate cachefiles -- since we are testing gfx801 and 4 CUs (default config)
+# generate cachefiles -- since we are testing gfx902 and 4 CUs (default config)
 # in tester, we want cachefiles for this setup
 docker run --rm --volume "${gem5_root}":"${gem5_root}" -w \
     "${gem5_root}/gem5-resources/src/gpu/DNNMark" \
     "-v${gem5_root}/gem5-resources/src/gpu/DNNMark/cachefiles:/root/.cache/miopen/2.9.0" \
     --memory="${docker_mem_limit}" hacc-test-weekly bash -c \
-    "python3 generate_cachefiles.py cachefiles.csv --gfx-version=gfx801 \
+    "python3 generate_cachefiles.py cachefiles.csv --gfx-version=gfx902 \
     --num-cus=4"
 
 # generate mmap data for DNNMark (makes simulation much faster)
diff --git a/tests/gem5/se_mode/hello_se/test_hello_se.py b/tests/gem5/se_mode/hello_se/test_hello_se.py
index 3520f3c7cf..43bcce44fd 100644
--- a/tests/gem5/se_mode/hello_se/test_hello_se.py
+++ b/tests/gem5/se_mode/hello_se/test_hello_se.py
@@ -48,7 +48,6 @@ import re
 from testlib import *
 
 isa_str_map = {
-    constants.gcn3_x86_tag: "x86",
     constants.arm_tag: "arm",
     constants.mips_tag: "mips",
     constants.riscv_tag: "riscv",