diff --git a/test/MC/ARM/v8fp.s b/test/MC/ARM/fp-armv8.s
similarity index 98%
rename from test/MC/ARM/v8fp.s
rename to test/MC/ARM/fp-armv8.s
index b12d7e26fc2..cba4a5157c1 100644
--- a/test/MC/ARM/v8fp.s
+++ b/test/MC/ARM/fp-armv8.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc -triple armv8 -mattr=+v8fp -show-encoding < %s | FileCheck %s
+@ RUN: llvm-mc -triple armv8 -mattr=+fp-armv8 -show-encoding < %s | FileCheck %s
 
 @ VCVT{B,T}
 
diff --git a/test/MC/ARM/invalid-v8fp.s b/test/MC/ARM/invalid-fp-armv8.s
similarity index 96%
rename from test/MC/ARM/invalid-v8fp.s
rename to test/MC/ARM/invalid-fp-armv8.s
index b5d572e5b5f..d640dc1dbee 100644
--- a/test/MC/ARM/invalid-v8fp.s
+++ b/test/MC/ARM/invalid-fp-armv8.s
@@ -1,4 +1,4 @@
-@ RUN: not llvm-mc -triple armv8 -show-encoding -mattr=+v8fp < %s 2>&1 | FileCheck %s --check-prefix=V8
+@ RUN: not llvm-mc -triple armv8 -show-encoding -mattr=+fp-armv8 < %s 2>&1 | FileCheck %s --check-prefix=V8
 
 @ VCVT{B,T}
 
diff --git a/test/MC/ARM/thumb-v8fp.s b/test/MC/ARM/thumb-fp-armv8.s
similarity index 98%
rename from test/MC/ARM/thumb-v8fp.s
rename to test/MC/ARM/thumb-fp-armv8.s
index 50cd005dcbe..a730fa2d8f4 100644
--- a/test/MC/ARM/thumb-v8fp.s
+++ b/test/MC/ARM/thumb-fp-armv8.s
@@ -1,4 +1,4 @@
-@ RUN: llvm-mc -triple thumbv8 -mattr=+v8fp -show-encoding < %s | FileCheck %s
+@ RUN: llvm-mc -triple thumbv8 -mattr=+fp-armv8 -show-encoding < %s | FileCheck %s
 
 @ VCVT{B,T}
 
diff --git a/test/MC/Disassembler/ARM/v8fp.txt b/test/MC/Disassembler/ARM/fp-armv8.txt
similarity index 96%
rename from test/MC/Disassembler/ARM/v8fp.txt
rename to test/MC/Disassembler/ARM/fp-armv8.txt
index a6e88b60cb3..4d2f8f6881c 100644
--- a/test/MC/Disassembler/ARM/v8fp.txt
+++ b/test/MC/Disassembler/ARM/fp-armv8.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -disassemble -triple armv8 -mattr=+v8fp -show-encoding < %s | FileCheck %s
+# RUN: llvm-mc -disassemble -triple armv8 -mattr=+fp-armv8 -show-encoding < %s | FileCheck %s
 
 0xe0 0x3b 0xb2 0xee
 # CHECK: vcvtt.f64.f16 d3, s1
diff --git a/test/MC/Disassembler/ARM/thumb-v8fp.txt b/test/MC/Disassembler/ARM/thumb-fp-armv8.txt
similarity index 96%
rename from test/MC/Disassembler/ARM/thumb-v8fp.txt
rename to test/MC/Disassembler/ARM/thumb-fp-armv8.txt
index 345719242b0..c90eed6fa1f 100644
--- a/test/MC/Disassembler/ARM/thumb-v8fp.txt
+++ b/test/MC/Disassembler/ARM/thumb-fp-armv8.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -disassemble -triple thumbv8 -mattr=+v8fp -show-encoding < %s | FileCheck %s
+# RUN: llvm-mc -disassemble -triple thumbv8 -mattr=+fp-armv8 -show-encoding < %s | FileCheck %s
 
 0xb2 0xee 0xe0 0x3b
 # CHECK: vcvtt.f64.f16 d3, s1