diff --git a/llvm/test/Instrumentation/MemorySanitizer/AArch64/neon_vst.ll b/llvm/test/Instrumentation/MemorySanitizer/AArch64/arm64-st1.ll
similarity index 100%
rename from llvm/test/Instrumentation/MemorySanitizer/AArch64/neon_vst.ll
rename to llvm/test/Instrumentation/MemorySanitizer/AArch64/arm64-st1.ll
diff --git a/llvm/test/Instrumentation/MemorySanitizer/AArch64/neon_vst_lane.ll b/llvm/test/Instrumentation/MemorySanitizer/AArch64/arm64-st1_lane.ll
similarity index 100%
rename from llvm/test/Instrumentation/MemorySanitizer/AArch64/neon_vst_lane.ll
rename to llvm/test/Instrumentation/MemorySanitizer/AArch64/arm64-st1_lane.ll
diff --git a/llvm/test/Instrumentation/MemorySanitizer/AArch64/neon_vst_origins.ll b/llvm/test/Instrumentation/MemorySanitizer/AArch64/arm64-st1_origins.ll
similarity index 100%
rename from llvm/test/Instrumentation/MemorySanitizer/AArch64/neon_vst_origins.ll
rename to llvm/test/Instrumentation/MemorySanitizer/AArch64/arm64-st1_origins.ll
diff --git a/llvm/test/Instrumentation/MemorySanitizer/AArch64/neon_tbl.ll b/llvm/test/Instrumentation/MemorySanitizer/AArch64/arm64-tbl.ll
similarity index 100%
rename from llvm/test/Instrumentation/MemorySanitizer/AArch64/neon_tbl.ll
rename to llvm/test/Instrumentation/MemorySanitizer/AArch64/arm64-tbl.ll
diff --git a/llvm/test/Instrumentation/MemorySanitizer/AArch64/arm64-vcvt.ll b/llvm/test/Instrumentation/MemorySanitizer/AArch64/arm64-vcvt.ll
index 48fe06728b71c..93a75df4b76cc 100644
--- a/llvm/test/Instrumentation/MemorySanitizer/AArch64/arm64-vcvt.ll
+++ b/llvm/test/Instrumentation/MemorySanitizer/AArch64/arm64-vcvt.ll
@@ -2,12 +2,6 @@
 ; RUN: opt < %s -passes=msan -S | FileCheck %s
 ;
 ; Suboptimally handled by visitInstruction: llvm.aarch64.neon.
-; - fcvtas, fcvtau
-; - fcvtms, fcvtmu
-; - fcvtns, fcvtnu
-; - fcvtps, fcvtpu
-; - fcvtzs, fcvtzu
-; - fcvtxn
 ; - vcvtfp2fxs, vcvtfp2fxu
 ; - vcvtfxs2fp, vcvtfxu2fp
 ;
diff --git a/llvm/test/Instrumentation/MemorySanitizer/AArch64/neon_vmul.ll b/llvm/test/Instrumentation/MemorySanitizer/AArch64/arm64-vmul.ll
similarity index 100%
rename from llvm/test/Instrumentation/MemorySanitizer/AArch64/neon_vmul.ll
rename to llvm/test/Instrumentation/MemorySanitizer/AArch64/arm64-vmul.ll