diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 8d211f7182..8855862831 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-01  H.J. Lu <hjl@gnu.org>
+
+	* gas/mips/elf-rel6.s: Add ".p2align 4".
+	* gas/mips/elf-rel6.d: Check nop.
+
 2002-08-01  Richard Sandiford  <rsandifo@redhat.com>
 
 	* gas/mips/elf-rel6.[sd]: New test.
diff --git a/gas/testsuite/gas/mips/elf-rel6.d b/gas/testsuite/gas/mips/elf-rel6.d
index 5baadf9445..3ff37b27ed 100644
--- a/gas/testsuite/gas/mips/elf-rel6.d
+++ b/gas/testsuite/gas/mips/elf-rel6.d
@@ -8,3 +8,7 @@ Disassembly of section \.text:
 			0: R_MIPS16_GPREL	bar
 0+04 <.*> lb	v0,1\(v1\)
 			4: R_MIPS16_GPREL	bar
+0+08 <[^>]*> nop
+0+0a <[^>]*> nop
+0+0c <[^>]*> nop
+0+0e <[^>]*> nop
diff --git a/gas/testsuite/gas/mips/elf-rel6.s b/gas/testsuite/gas/mips/elf-rel6.s
index e0bc37ab69..6735d7555f 100644
--- a/gas/testsuite/gas/mips/elf-rel6.s
+++ b/gas/testsuite/gas/mips/elf-rel6.s
@@ -14,3 +14,6 @@ f:
 	lb	$2,%gprel(bar)($3)
 	lb	$2,%gprel(bar+1)($3)
 	.end	f
+
+# align section end to 16-byte boundary for easier testing on multiple targets
+	.p2align 4