diff --git a/test/MC/AsmParser/X86/dg.exp b/test/MC/X86/dg.exp
similarity index 100%
rename from test/MC/AsmParser/X86/dg.exp
rename to test/MC/X86/dg.exp
diff --git a/test/MC/AsmParser/X86/x86-32-avx.s b/test/MC/X86/x86-32-avx.s
similarity index 100%
rename from test/MC/AsmParser/X86/x86-32-avx.s
rename to test/MC/X86/x86-32-avx.s
diff --git a/test/MC/AsmParser/X86/x86-32-coverage.s b/test/MC/X86/x86-32-coverage.s
similarity index 100%
rename from test/MC/AsmParser/X86/x86-32-coverage.s
rename to test/MC/X86/x86-32-coverage.s
diff --git a/test/MC/AsmParser/X86/x86-32-fma3.s b/test/MC/X86/x86-32-fma3.s
similarity index 100%
rename from test/MC/AsmParser/X86/x86-32-fma3.s
rename to test/MC/X86/x86-32-fma3.s
diff --git a/test/MC/AsmParser/X86/x86-32.s b/test/MC/X86/x86-32.s
similarity index 100%
rename from test/MC/AsmParser/X86/x86-32.s
rename to test/MC/X86/x86-32.s
diff --git a/test/MC/AsmParser/X86/x86-64.s b/test/MC/X86/x86-64.s
similarity index 100%
rename from test/MC/AsmParser/X86/x86-64.s
rename to test/MC/X86/x86-64.s
diff --git a/test/MC/AsmParser/X86/x86_64-avx-clmul-encoding.s b/test/MC/X86/x86_64-avx-clmul-encoding.s
similarity index 100%
rename from test/MC/AsmParser/X86/x86_64-avx-clmul-encoding.s
rename to test/MC/X86/x86_64-avx-clmul-encoding.s
diff --git a/test/MC/AsmParser/X86/x86_64-avx-encoding.s b/test/MC/X86/x86_64-avx-encoding.s
similarity index 100%
rename from test/MC/AsmParser/X86/x86_64-avx-encoding.s
rename to test/MC/X86/x86_64-avx-encoding.s
diff --git a/test/MC/AsmParser/X86/x86_64-encoding.s b/test/MC/X86/x86_64-encoding.s
similarity index 100%
rename from test/MC/AsmParser/X86/x86_64-encoding.s
rename to test/MC/X86/x86_64-encoding.s
diff --git a/test/MC/AsmParser/X86/x86_64-fma3-encoding.s b/test/MC/X86/x86_64-fma3-encoding.s
similarity index 100%
rename from test/MC/AsmParser/X86/x86_64-fma3-encoding.s
rename to test/MC/X86/x86_64-fma3-encoding.s
diff --git a/test/MC/AsmParser/X86/x86_64-imm-widths.s b/test/MC/X86/x86_64-imm-widths.s
similarity index 100%
rename from test/MC/AsmParser/X86/x86_64-imm-widths.s
rename to test/MC/X86/x86_64-imm-widths.s
diff --git a/test/MC/AsmParser/X86/x86_directives.s b/test/MC/X86/x86_directives.s
similarity index 100%
rename from test/MC/AsmParser/X86/x86_directives.s
rename to test/MC/X86/x86_directives.s
diff --git a/test/MC/AsmParser/X86/x86_errors.s b/test/MC/X86/x86_errors.s
similarity index 100%
rename from test/MC/AsmParser/X86/x86_errors.s
rename to test/MC/X86/x86_errors.s
diff --git a/test/MC/AsmParser/X86/x86_operands.s b/test/MC/X86/x86_operands.s
similarity index 100%
rename from test/MC/AsmParser/X86/x86_operands.s
rename to test/MC/X86/x86_operands.s