diff --git a/gas/ChangeLog b/gas/ChangeLog
index ba6d9ca7895..2df3fdb4e7c 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,12 @@
+2018-08-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* testsuite/gas/i386/evex-no-scale.s: Removed.
+	* testsuite/gas/i386/evex-no-scale-32.d: Don't use
+	evex-no-scale.s.
+	* testsuite/gas/i386/evex-no-scale-64.d: Likewise.
+	* testsuite/gas/i386/evex-no-scale-32.s: New file.
+	* testsuite/gas/i386/evex-no-scale-64.s: Likewise.
+
 2018-08-09  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* as.c (show_usage): Display default option for --elf-stt-common=.
diff --git a/gas/testsuite/gas/i386/evex-no-scale-32.d b/gas/testsuite/gas/i386/evex-no-scale-32.d
index e6116bc5929..0a2860d32e3 100644
--- a/gas/testsuite/gas/i386/evex-no-scale-32.d
+++ b/gas/testsuite/gas/i386/evex-no-scale-32.d
@@ -1,4 +1,3 @@
-#source: evex-no-scale.s
 #objdump: -dw
 #name: ix86 EVEX no disp scaling
 
diff --git a/gas/testsuite/gas/i386/evex-no-scale-32.s b/gas/testsuite/gas/i386/evex-no-scale-32.s
new file mode 100644
index 00000000000..e28c73f2a36
--- /dev/null
+++ b/gas/testsuite/gas/i386/evex-no-scale-32.s
@@ -0,0 +1,7 @@
+	.allow_index_reg
+	.text
+disp:
+	vmovaps	64(,%eax), %zmm0
+	vmovaps	64(,%eiz), %zmm0
+	vmovaps	64, %zmm0
+	addr16 vmovaps 64, %zmm0
diff --git a/gas/testsuite/gas/i386/evex-no-scale-64.d b/gas/testsuite/gas/i386/evex-no-scale-64.d
index b66f15bf8bc..d52d947ab3a 100644
--- a/gas/testsuite/gas/i386/evex-no-scale-64.d
+++ b/gas/testsuite/gas/i386/evex-no-scale-64.d
@@ -1,4 +1,3 @@
-#source: evex-no-scale.s
 #objdump: -dw
 #name: x86-64 EVEX no disp scaling
 
diff --git a/gas/testsuite/gas/i386/evex-no-scale.s b/gas/testsuite/gas/i386/evex-no-scale-64.s
similarity index 52%
rename from gas/testsuite/gas/i386/evex-no-scale.s
rename to gas/testsuite/gas/i386/evex-no-scale-64.s
index ed0f2312af5..bc3749cc0c5 100644
--- a/gas/testsuite/gas/i386/evex-no-scale.s
+++ b/gas/testsuite/gas/i386/evex-no-scale-64.s
@@ -1,19 +1,9 @@
 	.allow_index_reg
-	.section .probe, "", @progbits
-.Lprobe_64bit:
-	inc	%eax
-.equiv is_64bit, (. - .Lprobe_64bit) / 2
-
 	.text
 disp:
-.if is_64bit
 	vmovaps	-1024(%rip), %zmm0
 	vmovaps	64(,%rax), %zmm0
 	vmovaps	64(,%riz), %zmm0
-.endif
 	vmovaps	64(,%eax), %zmm0
 	vmovaps	64(,%eiz), %zmm0
 	vmovaps	64, %zmm0
-.if !is_64bit
-	addr16 vmovaps 64, %zmm0
-.endif