diff --git a/TestCases/TestCase.py b/TestCases/TestCase.py
index 1d1a181c8d8..fad7d560766 100644
--- a/TestCases/TestCase.py
+++ b/TestCases/TestCase.py
@@ -111,8 +111,8 @@ def __init__(self,tag_in):
         self.ntest_vals = 4
         self.test_vals = []
         self.test_vals_aarch64 = []
-        self.cpu_arch = platform.processor()
-        self.enabled_on_cpu_arch = ["x86_64", "aarch64"]
+        self.cpu_arch = platform.machine().casefold()
+        self.enabled_on_cpu_arch = ["x86_64","amd64","aarch64","arm64"]
         self.enabled_with_tsan = True
         self.command = self.Command()
         self.timeout = 0
@@ -957,7 +957,7 @@ def is_enabled(self, running_with_tsan=False):
 
     def adjust_test_data(self):
 
-        if self.cpu_arch == 'aarch64':
+        if self.cpu_arch == 'aarch64' or self.cpu_arch == 'arm64':
             if len(self.test_vals_aarch64) != 0:
                 self.test_vals = self.test_vals_aarch64