diff --git a/test/MC/AsmParser/arm_word_directive.s b/test/MC/AsmParser/ARM/arm_word_directive.s
similarity index 100%
rename from test/MC/AsmParser/arm_word_directive.s
rename to test/MC/AsmParser/ARM/arm_word_directive.s
diff --git a/test/MC/AsmParser/ARM/dg.exp b/test/MC/AsmParser/ARM/dg.exp
new file mode 100644
index 00000000000..3ff359aab39
--- /dev/null
+++ b/test/MC/AsmParser/ARM/dg.exp
@@ -0,0 +1,5 @@
+load_lib llvm.exp
+
+if { [llvm_supports_target ARM] } {
+  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
+}
diff --git a/test/MC/AsmParser/X86/dg.exp b/test/MC/AsmParser/X86/dg.exp
new file mode 100644
index 00000000000..629a1477361
--- /dev/null
+++ b/test/MC/AsmParser/X86/dg.exp
@@ -0,0 +1,5 @@
+load_lib llvm.exp
+
+if { [llvm_supports_target X86] } {
+  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
+}
diff --git a/test/MC/AsmParser/x86_instructions.s b/test/MC/AsmParser/X86/x86_instructions.s
similarity index 100%
rename from test/MC/AsmParser/x86_instructions.s
rename to test/MC/AsmParser/X86/x86_instructions.s
diff --git a/test/MC/AsmParser/x86_operands.s b/test/MC/AsmParser/X86/x86_operands.s
similarity index 100%
rename from test/MC/AsmParser/x86_operands.s
rename to test/MC/AsmParser/X86/x86_operands.s
diff --git a/test/MC/AsmParser/x86_word_directive.s b/test/MC/AsmParser/X86/x86_word_directive.s
similarity index 100%
rename from test/MC/AsmParser/x86_word_directive.s
rename to test/MC/AsmParser/X86/x86_word_directive.s
diff --git a/test/MC/AsmParser/dg.exp b/test/MC/AsmParser/dg.exp
index ca6aefe9c53..64cb75b20ff 100644
--- a/test/MC/AsmParser/dg.exp
+++ b/test/MC/AsmParser/dg.exp
@@ -1,6 +1,4 @@
 load_lib llvm.exp
 
-if { [llvm_supports_target X86] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{s}]]
-}
+RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{s}]]