diff --git a/gas/testsuite/gas/aarch64/ls64.s b/gas/testsuite/gas/aarch64/ls64.s
index eb1607d0d26064e05b1bec003219f6fb7bf45516..61164182d16d62f5ce436eb57de002e935a735b9 100644
--- a/gas/testsuite/gas/aarch64/ls64.s
+++ b/gas/testsuite/gas/aarch64/ls64.s
@@ -1,5 +1,5 @@
 /* Atomic 64-byte load/store instructions.  */
-.arch armv8.7-a+ls64
+.arch armv8.6-a+ls64
 
 /* Single-copy Atomic 64-byte Load.  */
 	ld64b x0, [x1]
diff --git a/opcodes/aarch64-tbl.h b/opcodes/aarch64-tbl.h
index a54b96839196c45a15b38f111012b4c8a609f464..2b409dc57f31d8a15b00f30a7507ae559a19d8c8 100644
--- a/opcodes/aarch64-tbl.h
+++ b/opcodes/aarch64-tbl.h
@@ -2421,7 +2421,7 @@ static const aarch64_feature_set aarch64_feature_v8_r =
 static const aarch64_feature_set aarch64_feature_csre =
   AARCH64_FEATURE (AARCH64_FEATURE_CSRE, 0);
 static const aarch64_feature_set aarch64_feature_ls64 =
-  AARCH64_FEATURE (AARCH64_FEATURE_V8_7 | AARCH64_FEATURE_LS64, 0);
+  AARCH64_FEATURE (AARCH64_FEATURE_V8_6 | AARCH64_FEATURE_LS64, 0);
 
 #define CORE		&aarch64_feature_v8
 #define FP		&aarch64_feature_fp