diff --git a/test/Transforms/LoopIdiom/X86/lit.local.cfg b/test/Transforms/LoopIdiom/X86/lit.local.cfg
new file mode 100644
index 00000000000..a8ad0f1a28b
--- /dev/null
+++ b/test/Transforms/LoopIdiom/X86/lit.local.cfg
@@ -0,0 +1,6 @@
+config.suffixes = ['.ll', '.c', '.cpp']
+
+targets = set(config.root.targets_to_build.split())
+if not 'X86' in targets:
+    config.unsupported = True
+
diff --git a/test/Transforms/LoopIdiom/popcnt.ll b/test/Transforms/LoopIdiom/X86/popcnt.ll
similarity index 100%
rename from test/Transforms/LoopIdiom/popcnt.ll
rename to test/Transforms/LoopIdiom/X86/popcnt.ll