diff --git a/gas/ChangeLog b/gas/ChangeLog
index a46492ba9a..dc1d25a0a6 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,14 @@
+2018-05-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* testsuite/gas/i386/avx512f-plain.s: Append ".p2align 4,0".
+	* testsuite/gas/i386/avx512vl-plain.s: Likewise.
+	* testsuite/gas/i386/bnd.s: Likewise.
+	* testsuite/gas/i386/stN.s: Likewise.
+	* testsuite/gas/i386/avx512f-plain.l: Updated.
+	* testsuite/gas/i386/avx512vl-plain.l: Likewise.
+	* testsuite/gas/i386/bnd.l: Likewise.
+	* testsuite/gas/i386/stN.l: Likewise.
+
 2018-05-04  Alan Modra  <amodra@gmail.com>
 
 	* config/obj-evax.c (shorten_identifier): Use memcpy in place
diff --git a/gas/testsuite/gas/i386/avx512f-plain.l b/gas/testsuite/gas/i386/avx512f-plain.l
index d910b762bf..3c7ce91020 100644
--- a/gas/testsuite/gas/i386/avx512f-plain.l
+++ b/gas/testsuite/gas/i386/avx512f-plain.l
@@ -24,3 +24,5 @@ GAS LISTING .*
 [ 	]*15[ 	]+\.arch \.vpclmulqdq
 [ 	]*16[ 	]+\?\?\?\? 62F36D48[ 	]+vpclmulqdq[ 	]+\$0, %zmm1, %zmm2, %zmm3
 [ 	]*16[ 	]+44D900
+[ 	]*17[ 	]+\?\?\?\? 00000000 		\.p2align 4,0
+#...
diff --git a/gas/testsuite/gas/i386/avx512f-plain.s b/gas/testsuite/gas/i386/avx512f-plain.s
index d295d70f5b..03a0ed7b8d 100644
--- a/gas/testsuite/gas/i386/avx512f-plain.s
+++ b/gas/testsuite/gas/i386/avx512f-plain.s
@@ -14,3 +14,4 @@ _start:
 
 	.arch .vpclmulqdq
 	vpclmulqdq	$0, %zmm1, %zmm2, %zmm3
+	.p2align 4,0
diff --git a/gas/testsuite/gas/i386/avx512vl-plain.l b/gas/testsuite/gas/i386/avx512vl-plain.l
index 447c615c98..c2dee22022 100644
--- a/gas/testsuite/gas/i386/avx512vl-plain.l
+++ b/gas/testsuite/gas/i386/avx512vl-plain.l
@@ -24,3 +24,5 @@ GAS LISTING .*
 [ 	]*15[ 	]+\.arch \.vpclmulqdq
 [ 	]*16[ 	]+\?\?\?\? 62F36D28[ 	]+\{evex\} vpclmulqdq[ 	]+\$0, %ymm1, %ymm2, %ymm3
 [ 	]*16[ 	]+44D900
+[ 	]*17[ 	]+\?\?\?\? 00000000 		\.p2align 4,0
+#...
diff --git a/gas/testsuite/gas/i386/avx512vl-plain.s b/gas/testsuite/gas/i386/avx512vl-plain.s
index 711f13a9ef..75e356158a 100644
--- a/gas/testsuite/gas/i386/avx512vl-plain.s
+++ b/gas/testsuite/gas/i386/avx512vl-plain.s
@@ -14,3 +14,4 @@ _start:
 
 	.arch .vpclmulqdq
 	{evex} vpclmulqdq	$0, %ymm1, %ymm2, %ymm3
+	.p2align 4,0
diff --git a/gas/testsuite/gas/i386/bnd.l b/gas/testsuite/gas/i386/bnd.l
index 422289660d..c9377d8c4b 100644
--- a/gas/testsuite/gas/i386/bnd.l
+++ b/gas/testsuite/gas/i386/bnd.l
@@ -10,3 +10,5 @@ GAS LISTING .*
 [ 	]*5[ 	]+\?\?\?\? A1000000[ 	]+mov	eax, bnd0
 [ 	]*5[ 	]+00
 [ 	]*6[ 	]+bndmov	bnd0, bnd0
+[ 	]*7[ 	]+\?\?\?\? 00000000 		\.p2align 4,0
+#...
diff --git a/gas/testsuite/gas/i386/bnd.s b/gas/testsuite/gas/i386/bnd.s
index 9ca4ce7322..e2c61bf4ed 100644
--- a/gas/testsuite/gas/i386/bnd.s
+++ b/gas/testsuite/gas/i386/bnd.s
@@ -4,3 +4,4 @@
 bnd:
 	mov	eax, bnd0
 	bndmov	bnd0, bnd0
+	.p2align 4,0
diff --git a/gas/testsuite/gas/i386/stN.l b/gas/testsuite/gas/i386/stN.l
index 5885686e7e..8769004dc3 100644
--- a/gas/testsuite/gas/i386/stN.l
+++ b/gas/testsuite/gas/i386/stN.l
@@ -14,3 +14,5 @@ GAS LISTING .*
 [ 	]*6[ 	]+mov	eax, st\(7\)
 [ 	]*7[ 	]+mov	eax, st \( 7 \)
 [ 	]*8[ 	]+mov	eax, x\(7\)
+[ 	]*9[ 	]+\?\?\?\? 00000000 		\.p2align 4,0
+#...
diff --git a/gas/testsuite/gas/i386/stN.s b/gas/testsuite/gas/i386/stN.s
index 6a1512e526..ef6177e8af 100644
--- a/gas/testsuite/gas/i386/stN.s
+++ b/gas/testsuite/gas/i386/stN.s
@@ -6,3 +6,4 @@ stN:
 	mov	eax, st(7)
 	mov	eax, st ( 7 )
 	mov	eax, x(7)
+	.p2align 4,0