diff --git a/lld/test/elf/Mips/base-address.test b/lld/test/elf/Mips/base-address.test
index 2e6fbafb76db..153cff87d854 100644
--- a/lld/test/elf/Mips/base-address.test
+++ b/lld/test/elf/Mips/base-address.test
@@ -1,4 +1,4 @@
-# REQUIRES: Mips
+# REQUIRES: mips
 
 # Check executable base address configuration. Base address should be
 # equal to 0x400000 and the MIPS_BASE_ADDRESS dynamic tag's value should
diff --git a/lld/test/elf/ifunc.test b/lld/test/elf/ifunc.test
index e0c08bd10e4e..e148d18cd936 100644
--- a/lld/test/elf/ifunc.test
+++ b/lld/test/elf/ifunc.test
@@ -1,4 +1,4 @@
-# REQUIRES: X86
+# REQUIRES: x86
 
 # This test checks that IRELATIVE relocations are created for symbols that
 # need relocation even for static links.
diff --git a/lld/test/elf/tls.test b/lld/test/elf/tls.test
index 9a7e9779e68a..7dffe0948275 100644
--- a/lld/test/elf/tls.test
+++ b/lld/test/elf/tls.test
@@ -1,5 +1,5 @@
-# REQUIRES: X86
-#
+# REQUIRES: x86
+
 # This tests verifies that TLS variables have correct offsets
 RUN: lld -flavor gnu -target x86_64-linux %p/Inputs/tls.x86-64 -static  \
 RUN: --output-filetype=yaml --noinhibit-exec | FileCheck %s -check-prefix=YAML
diff --git a/lld/test/elf/x86_64-kinds.test b/lld/test/elf/x86_64-kinds.test
index 60e69014ec3a..49586059d953 100644
--- a/lld/test/elf/x86_64-kinds.test
+++ b/lld/test/elf/x86_64-kinds.test
@@ -1,4 +1,4 @@
-REQUIRES: X86
+REQUIRES: x86
 
 RUN: lld -flavor gnu -target x86_64-linux -o %t1 %p/Inputs/relocs.x86-64 \
 RUN:   -e _start -static
diff --git a/lld/test/lit.cfg b/lld/test/lit.cfg
index 0df6ac6d99d5..da1cc4a2b14e 100644
--- a/lld/test/lit.cfg
+++ b/lld/test/lit.cfg
@@ -155,6 +155,8 @@ if re.search(r'ARM', llvm_config_output_list[2]):
     config.available_features.add('arm')
 if re.search(r'Mips', llvm_config_output_list[2]):
     config.available_features.add('mips')
+if re.search(r'X86', llvm_config_output_list[2]):
+    config.available_features.add('x86')
 llvm_config_cmd.wait()
 
 # Check if Windows resource file compiler exists.
diff --git a/lld/test/mach-o/lazy-bind-x86_64.yaml b/lld/test/mach-o/lazy-bind-x86_64.yaml
index b817086918a5..54d787ce91be 100644
--- a/lld/test/mach-o/lazy-bind-x86_64.yaml
+++ b/lld/test/mach-o/lazy-bind-x86_64.yaml
@@ -1,5 +1,5 @@
-# REQUIRES: X86
-#
+# REQUIRES: x86
+
 # RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t  \
 # RUN:   %p/Inputs/libSystem.yaml
 # RUN: llvm-objdump -lazy-bind %t | FileCheck %s
diff --git a/lld/test/pecoff/alternatename.test b/lld/test/pecoff/alternatename.test
index 03cf0f794e8b..926a8eae2876 100644
--- a/lld/test/pecoff/alternatename.test
+++ b/lld/test/pecoff/alternatename.test
@@ -1,5 +1,5 @@
-# REQUIRES: X86
-#
+# REQUIRES: x86
+
 # RUN: yaml2obj %p/Inputs/alternatename1.obj.yaml > %t1.obj
 # RUN: yaml2obj %p/Inputs/alternatename2.obj.yaml > %t2.obj
 # RUN: yaml2obj %p/Inputs/alternatename3.obj.yaml > %t3.obj
diff --git a/lld/test/pecoff/armnt-blx23t.test b/lld/test/pecoff/armnt-blx23t.test
index 60f5a35854f1..56639fa22be9 100644
--- a/lld/test/pecoff/armnt-blx23t.test
+++ b/lld/test/pecoff/armnt-blx23t.test
@@ -1,5 +1,5 @@
-# REQUIRES: ARM
-#
+# REQUIRES: arm
+
 # RUN: yaml2obj -format coff -o %t.obj %p/Inputs/armnt-blx23t.obj.yaml
 # RUN: llvm-objdump -d %t.obj | FileCheck %s -check-prefix BEFORE
 # RUN: lld -flavor link /entry:function /subsystem:console /out:%t.exe %t.obj
diff --git a/lld/test/pecoff/armnt-branch24t.test b/lld/test/pecoff/armnt-branch24t.test
index c269033d0101..1a727ed7d725 100644
--- a/lld/test/pecoff/armnt-branch24t.test
+++ b/lld/test/pecoff/armnt-branch24t.test
@@ -1,5 +1,5 @@
-# REQUIRES: ARM
-#
+# REQUIRES: arm
+
 # RUN: yaml2obj -format coff -o %t.obj %p/Inputs/armnt-branch24t.obj.yaml
 # RUN: llvm-objdump -d %t.obj | FileCheck %s -check-prefix BEFORE
 # RUN: lld -flavor link /entry:function /subsystem:console /out:%t.exe %t.obj
diff --git a/lld/test/pecoff/armnt-mov32t-exec.test b/lld/test/pecoff/armnt-mov32t-exec.test
index 73ca145aeb96..de4feffea0cc 100644
--- a/lld/test/pecoff/armnt-mov32t-exec.test
+++ b/lld/test/pecoff/armnt-mov32t-exec.test
@@ -1,5 +1,5 @@
-# REQUIRES: ARM
-#
+# REQUIRES: arm
+
 # RUN: yaml2obj -format coff -o %t.obj %p/Inputs/armnt-mov32t-exec.obj.yaml
 # RUN: llvm-objdump -d %t.obj | FileCheck %s -check-prefix BEFORE
 # RUN: lld -flavor link /out:%t.exe /subsystem:console /entry:get_function %t.obj
diff --git a/lld/test/pecoff/armnt-movt32t.test b/lld/test/pecoff/armnt-movt32t.test
index 9009648c3827..2ae47ef75846 100644
--- a/lld/test/pecoff/armnt-movt32t.test
+++ b/lld/test/pecoff/armnt-movt32t.test
@@ -1,5 +1,5 @@
-# REQUIRES: ARM
-#
+# REQUIRES: arm
+
 # RUN: yaml2obj -format coff -o %t.obj %p/Inputs/armnt-mov32t.obj.yaml
 # RUN: llvm-objdump -d %t.obj | FileCheck %s -check-prefix BEFORE
 # RUN: lld -flavor link /entry:get_buffer /subsystem:console /out:%t.exe %t.obj
diff --git a/lld/test/pecoff/common-symbol.test b/lld/test/pecoff/common-symbol.test
index a2ba5b182922..49d4d8725da4 100644
--- a/lld/test/pecoff/common-symbol.test
+++ b/lld/test/pecoff/common-symbol.test
@@ -1,5 +1,5 @@
-# REQUIRES: X86
-#
+# REQUIRES: x86
+
 # RUN: yaml2obj %p/Inputs/common-symbol.obj.yaml > %t.obj
 #
 # RUN: lld -flavor link /machine:x64 /out:%t.exe /subsystem:console /force \
diff --git a/lld/test/pecoff/hello64.test b/lld/test/pecoff/hello64.test
index 30a12febd0a3..a631b553165b 100644
--- a/lld/test/pecoff/hello64.test
+++ b/lld/test/pecoff/hello64.test
@@ -1,5 +1,5 @@
-# REQUIRES: X86
-#
+# REQUIRES: x86
+
 # RUN: yaml2obj %p/Inputs/hello64.obj.yaml > %t.obj
 
 # RUN: lld -flavor link /out:%t.exe /subsystem:windows /machine:x64 \
diff --git a/lld/test/pecoff/imagebase.test b/lld/test/pecoff/imagebase.test
index 4ef00379ded6..bb83e6b66124 100644
--- a/lld/test/pecoff/imagebase.test
+++ b/lld/test/pecoff/imagebase.test
@@ -1,5 +1,5 @@
-# REQUIRES: X86
-#
+# REQUIRES: x86
+
 # RUN: yaml2obj %p/Inputs/imagebase.obj.yaml > %t.obj
 
 # RUN: lld -flavor link /out:%t1.exe /subsystem:console /entry:_start \
diff --git a/lld/test/pecoff/importlib.test b/lld/test/pecoff/importlib.test
index 7f1ee6b44347..28e74f9dc78d 100644
--- a/lld/test/pecoff/importlib.test
+++ b/lld/test/pecoff/importlib.test
@@ -1,5 +1,5 @@
-# REQUIRES: X86
-#
+# REQUIRES: x86
+
 # Verify that lld can handle .lib files. "main.obj" refers "var" and
 # "fn" defined in "vars.lib".
 #
diff --git a/lld/test/pecoff/lib.test b/lld/test/pecoff/lib.test
index c8e0c0c3c14c..f435c117bc46 100644
--- a/lld/test/pecoff/lib.test
+++ b/lld/test/pecoff/lib.test
@@ -1,5 +1,5 @@
-# REQUIRES: X86
-#
+# REQUIRES: x86
+
 # Verify that lld can handle a library file.
 #
 # RUN: yaml2obj %p/Inputs/main.obj.yaml > %t.obj
diff --git a/lld/test/pecoff/multi.test b/lld/test/pecoff/multi.test
index 5362f4386f3f..e0bfdba6dda4 100644
--- a/lld/test/pecoff/multi.test
+++ b/lld/test/pecoff/multi.test
@@ -1,5 +1,5 @@
-# REQUIRES: X86
-#
+# REQUIRES: x86
+
 # Verify that lld can handle multiple input files.
 #
 # RUN: yaml2obj %p/Inputs/main.obj.yaml > %t1.obj
diff --git a/lld/test/pecoff/reloc.test b/lld/test/pecoff/reloc.test
index a461074db629..46b7431fa318 100644
--- a/lld/test/pecoff/reloc.test
+++ b/lld/test/pecoff/reloc.test
@@ -1,5 +1,5 @@
-# REQUIRES: X86
-#
+# REQUIRES: x86
+
 # RUN: yaml2obj %p/Inputs/reloc.obj.yaml > %t.obj
 #
 # RUN: lld -flavor link /out:%t.exe /subsystem:console /force /opt:noref \
diff --git a/lld/test/pecoff/reloc64.test b/lld/test/pecoff/reloc64.test
index ae25fe565f60..fc38bff03275 100644
--- a/lld/test/pecoff/reloc64.test
+++ b/lld/test/pecoff/reloc64.test
@@ -1,5 +1,5 @@
-# REQUIRES: X86
-#
+# REQUIRES: x86
+
 # RUN: yaml2obj %p/Inputs/reloc64.obj.yaml > %t.obj
 
 # RUN: lld -flavor link /out:%t.exe /subsystem:console /machine:x64 \