diff --git a/llvm/test/Instrumentation/MemorySanitizer/avx-intrinsics-x86.ll b/llvm/test/Instrumentation/MemorySanitizer/X86/avx-intrinsics-x86.ll
similarity index 100%
rename from llvm/test/Instrumentation/MemorySanitizer/avx-intrinsics-x86.ll
rename to llvm/test/Instrumentation/MemorySanitizer/X86/avx-intrinsics-x86.ll
diff --git a/llvm/test/Instrumentation/MemorySanitizer/avx2-intrinsics-x86.ll b/llvm/test/Instrumentation/MemorySanitizer/X86/avx2-intrinsics-x86.ll
similarity index 100%
rename from llvm/test/Instrumentation/MemorySanitizer/avx2-intrinsics-x86.ll
rename to llvm/test/Instrumentation/MemorySanitizer/X86/avx2-intrinsics-x86.ll
diff --git a/llvm/test/Instrumentation/MemorySanitizer/msan_x86_bts_asm.ll b/llvm/test/Instrumentation/MemorySanitizer/X86/msan_x86_bts_asm.ll
similarity index 100%
rename from llvm/test/Instrumentation/MemorySanitizer/msan_x86_bts_asm.ll
rename to llvm/test/Instrumentation/MemorySanitizer/X86/msan_x86_bts_asm.ll
diff --git a/llvm/test/Instrumentation/MemorySanitizer/msan_x86intrinsics.ll b/llvm/test/Instrumentation/MemorySanitizer/X86/msan_x86intrinsics.ll
similarity index 100%
rename from llvm/test/Instrumentation/MemorySanitizer/msan_x86intrinsics.ll
rename to llvm/test/Instrumentation/MemorySanitizer/X86/msan_x86intrinsics.ll
diff --git a/llvm/test/Instrumentation/MemorySanitizer/sse-intrinsics-x86.ll b/llvm/test/Instrumentation/MemorySanitizer/X86/sse-intrinsics-x86.ll
similarity index 100%
rename from llvm/test/Instrumentation/MemorySanitizer/sse-intrinsics-x86.ll
rename to llvm/test/Instrumentation/MemorySanitizer/X86/sse-intrinsics-x86.ll
diff --git a/llvm/test/Instrumentation/MemorySanitizer/sse2-intrinsics-x86.ll b/llvm/test/Instrumentation/MemorySanitizer/X86/sse2-intrinsics-x86.ll
similarity index 100%
rename from llvm/test/Instrumentation/MemorySanitizer/sse2-intrinsics-x86.ll
rename to llvm/test/Instrumentation/MemorySanitizer/X86/sse2-intrinsics-x86.ll
diff --git a/llvm/test/Instrumentation/MemorySanitizer/sse41-intrinsics-x86.ll b/llvm/test/Instrumentation/MemorySanitizer/X86/sse41-intrinsics-x86.ll
similarity index 100%
rename from llvm/test/Instrumentation/MemorySanitizer/sse41-intrinsics-x86.ll
rename to llvm/test/Instrumentation/MemorySanitizer/X86/sse41-intrinsics-x86.ll