diff --git a/lld/test/elf2/aarch64-relocs.s b/lld/test/elf2/aarch64-relocs.s
index 75e5adbc4e99..e3a0fa01861c 100644
--- a/lld/test/elf2/aarch64-relocs.s
+++ b/lld/test/elf2/aarch64-relocs.s
@@ -1,7 +1,7 @@
 # RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-freebsd %s -o %t
 # RUN: lld -flavor gnu2 %t -o %t2
 # RUN: llvm-objdump -d %t2 | FileCheck %s
-# REQUIRES: arm64
+# REQUIRES: aarch64
 
 .globl _start
 _start:
diff --git a/lld/test/elf2/basic-aarch64.s b/lld/test/elf2/basic-aarch64.s
index 4bcf4a8819ee..9eb2b5b5a191 100644
--- a/lld/test/elf2/basic-aarch64.s
+++ b/lld/test/elf2/basic-aarch64.s
@@ -2,7 +2,7 @@
 # RUN: lld -flavor gnu2 %t -o %t2
 # RUN: llvm-readobj -file-headers -sections -program-headers -symbols %t2 \
 # RUN:   | FileCheck %s
-# REQUIRES: arm64
+# REQUIRES: aarch64
 
 # exits with return code 42 on FreeBSD/AArch64
 .globl _start;
diff --git a/lld/test/lit.cfg b/lld/test/lit.cfg
index 8661ac1c686c..8c0ec51a2778 100644
--- a/lld/test/lit.cfg
+++ b/lld/test/lit.cfg
@@ -175,13 +175,17 @@ if re.search(r'DEBUG', llvm_config_output_list[0]):
     config.available_features.add('debug')
 if re.search(r'ON', llvm_config_output_list[1]):
     config.available_features.add('asserts')
-if re.search(r'ARM', llvm_config_output_list[2]):
+
+archs = llvm_config_output_list[2]
+if re.search(r'AArch64', archs):
+    config.available_features.add('aarch64')
+if re.search(r'ARM', archs):
     config.available_features.add('arm')
-if re.search(r'Mips', llvm_config_output_list[2]):
+if re.search(r'Mips', archs):
     config.available_features.add('mips')
-if re.search(r'X86', llvm_config_output_list[2]):
+if re.search(r'X86', archs):
     config.available_features.add('x86')
-if re.search(r'PowerPC', llvm_config_output_list[2]):
+if re.search(r'PowerPC', archs):
     config.available_features.add('ppc')
 llvm_config_cmd.wait()