diff --git a/llvm/test/Object/lit.local.cfg b/llvm/test/Object/lit.local.cfg
deleted file mode 100644
--- a/llvm/test/Object/lit.local.cfg
+++ /dev/null
@@ -1 +0,0 @@
-config.suffixes = ['.test', '.ll', '.s', '.yaml']
diff --git a/llvm/test/ObjectYAML/lit.local.cfg b/llvm/test/ObjectYAML/lit.local.cfg
deleted file mode 100644
--- a/llvm/test/ObjectYAML/lit.local.cfg
+++ /dev/null
@@ -1 +0,0 @@
-config.suffixes = ['.yaml']
diff --git a/llvm/test/lit.cfg.py b/llvm/test/lit.cfg.py
--- a/llvm/test/lit.cfg.py
+++ b/llvm/test/lit.cfg.py
@@ -22,7 +22,7 @@
 
 # suffixes: A list of file extensions to treat as test files. This is overriden
 # by individual lit.local.cfg files in the test subdirectories.
-config.suffixes = ['.ll', '.c', '.cxx', '.test', '.txt', '.s', '.mir']
+config.suffixes = ['.ll', '.c', '.test', '.txt', '.s', '.mir', '.yaml']
 
 # excludes: A list of directories to exclude from the testsuite. The 'Inputs'
 # subdirectories contain auxiliary inputs for various tests in their parent
diff --git a/llvm/test/tools/llvm-as/lit.local.cfg b/llvm/test/tools/llvm-as/lit.local.cfg
--- a/llvm/test/tools/llvm-as/lit.local.cfg
+++ b/llvm/test/tools/llvm-as/lit.local.cfg
@@ -1,4 +1,2 @@
 if not 'X86' in config.root.targets:
     config.unsupported = True
-
-config.suffixes = ['.ll', '.s', '.test', '.yaml']
diff --git a/llvm/test/tools/llvm-dwarfdump/lit.local.cfg b/llvm/test/tools/llvm-dwarfdump/lit.local.cfg
deleted file mode 100644
--- a/llvm/test/tools/llvm-dwarfdump/lit.local.cfg
+++ /dev/null
@@ -1 +0,0 @@
-config.suffixes = ['.test', '.ll', '.s', '.yaml']
diff --git a/llvm/test/tools/llvm-gsymutil/ARM_AArch64/lit.local.cfg b/llvm/test/tools/llvm-gsymutil/ARM_AArch64/lit.local.cfg
--- a/llvm/test/tools/llvm-gsymutil/ARM_AArch64/lit.local.cfg
+++ b/llvm/test/tools/llvm-gsymutil/ARM_AArch64/lit.local.cfg
@@ -1,4 +1,2 @@
 if not ('ARM' in config.root.targets and 'AArch64' in config.root.targets):
     config.unsupported = True
-
-config.suffixes = ['.test', '.yaml']
diff --git a/llvm/test/tools/llvm-gsymutil/X86/lit.local.cfg b/llvm/test/tools/llvm-gsymutil/X86/lit.local.cfg
--- a/llvm/test/tools/llvm-gsymutil/X86/lit.local.cfg
+++ b/llvm/test/tools/llvm-gsymutil/X86/lit.local.cfg
@@ -1,4 +1,2 @@
 if not 'X86' in config.root.targets:
     config.unsupported = True
-
-config.suffixes = ['.test', '.yaml']
diff --git a/llvm/test/tools/llvm-nm/lit.local.cfg b/llvm/test/tools/llvm-nm/lit.local.cfg
--- a/llvm/test/tools/llvm-nm/lit.local.cfg
+++ b/llvm/test/tools/llvm-nm/lit.local.cfg
@@ -1,4 +1,2 @@
 if not 'X86' in config.root.targets:
     config.unsupported = True
-
-config.suffixes = ['.ll', '.s', '.test', '.yaml']
diff --git a/llvm/test/tools/llvm-objdump/lit.local.cfg b/llvm/test/tools/llvm-objdump/lit.local.cfg
deleted file mode 100644
--- a/llvm/test/tools/llvm-objdump/lit.local.cfg
+++ /dev/null
@@ -1 +0,0 @@
-config.suffixes = ['.test', '.ll', '.s', '.yaml', '.txt']
diff --git a/llvm/test/tools/llvm-readobj/COFF/lit.local.cfg b/llvm/test/tools/llvm-readobj/COFF/lit.local.cfg
deleted file mode 100644
--- a/llvm/test/tools/llvm-readobj/COFF/lit.local.cfg
+++ /dev/null
@@ -1 +0,0 @@
-config.suffixes.add('.yaml')
diff --git a/llvm/test/tools/llvm-xray/X86/lit.local.cfg b/llvm/test/tools/llvm-xray/X86/lit.local.cfg
deleted file mode 100644
--- a/llvm/test/tools/llvm-xray/X86/lit.local.cfg
+++ /dev/null
@@ -1 +0,0 @@
-config.suffixes = ['.yaml', '.ll', '.txt']
diff --git a/llvm/test/tools/obj2yaml/lit.local.cfg b/llvm/test/tools/obj2yaml/lit.local.cfg
deleted file mode 100644
--- a/llvm/test/tools/obj2yaml/lit.local.cfg
+++ /dev/null
@@ -1 +0,0 @@
-config.suffixes = ['.test', '.yaml']
diff --git a/llvm/test/tools/yaml2obj/lit.local.cfg b/llvm/test/tools/yaml2obj/lit.local.cfg
deleted file mode 100644
--- a/llvm/test/tools/yaml2obj/lit.local.cfg
+++ /dev/null
@@ -1 +0,0 @@
-config.suffixes = ['.test', '.yaml']