diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index c7b2b079e8..8b3307d762 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,17 @@
+2001-06-08  H.J. Lu  <hjl@gnu.org>
+
+	* gas/mips/elfel-rel3.s: Moved to ...
+	* gas/mips/elf-rel3.s: Here.
+
+	* gas/mips/elf-rel3.d: Updated.
+
+	* gas/mips/elfel-rel3.d: Updated.
+
+	* gas/mips/relax.d: New file.
+	* gas/mips/relax.s: Likewise.
+
+	* gas/mips/mips.exp: Run relax and set xfail.
+
 2001-06-08  H.J. Lu  <hjl@gnu.org>
 
 	* gas/mips/illegal.s: New file.
diff --git a/gas/testsuite/gas/mips/elf-rel3.d b/gas/testsuite/gas/mips/elf-rel3.d
index 1d1014b687..41eaf57338 100644
--- a/gas/testsuite/gas/mips/elf-rel3.d
+++ b/gas/testsuite/gas/mips/elf-rel3.d
@@ -10,4 +10,4 @@ OFFSET           TYPE              VALUE
 
 
 Contents of section .data:
- 0000 12121212 fffffffc 00000000 00000000  ................
+ 0000 12121212 00000004 00000000 00000000  ................
diff --git a/gas/testsuite/gas/mips/elf-rel3.s b/gas/testsuite/gas/mips/elf-rel3.s
index 46c804676f..ddf2bef4d7 100644
--- a/gas/testsuite/gas/mips/elf-rel3.s
+++ b/gas/testsuite/gas/mips/elf-rel3.s
@@ -7,5 +7,5 @@ x:
 	.type	 b,@object
 	.size	 b,8
 b:
-	.word	b-4
+	.word	b+4
 	.word	x
diff --git a/gas/testsuite/gas/mips/elfel-rel3.d b/gas/testsuite/gas/mips/elfel-rel3.d
index c0a08b13c9..f630d4b23a 100644
--- a/gas/testsuite/gas/mips/elfel-rel3.d
+++ b/gas/testsuite/gas/mips/elfel-rel3.d
@@ -1,5 +1,6 @@
 #objdump: -sr -j .data
 #name: MIPS ELF reloc 3
+#source: elf-rel3.s
 
 .*:     file format elf.*mips
 
diff --git a/gas/testsuite/gas/mips/elfel-rel3.s b/gas/testsuite/gas/mips/elfel-rel3.s
deleted file mode 100644
index ddf2bef4d7..0000000000
--- a/gas/testsuite/gas/mips/elfel-rel3.s
+++ /dev/null
@@ -1,11 +0,0 @@
-	.data
-	.type	 x,@object
-	.size	 x,4
-x:
-	.word	0x12121212
-	.globl	b
-	.type	 b,@object
-	.size	 b,8
-b:
-	.word	b+4
-	.word	x
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index acc4c3bd1e..84389d23e6 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -113,6 +113,10 @@ if { [istarget mips*-*-*] } then {
     run_dump_test "mips32"
     run_dump_test "mips64"
 
+    # It will always fail until someone fixes it.
+    setup_xfail "mips*-*-*"
+    run_dump_test "relax"
+
     run_list_test "illegal" ""
 
     if $svr4pic {
diff --git a/gas/testsuite/gas/mips/relax.d b/gas/testsuite/gas/mips/relax.d
new file mode 100644
index 0000000000..f733700dc4
--- /dev/null
+++ b/gas/testsuite/gas/mips/relax.d
@@ -0,0 +1,8 @@
+#objdump: -dr --prefix-addresses -mmips:4000
+#name: MIPS relax
+
+# Test relaxation.
+
+.*: +file format .*mips.*
+
+Disassembly of section .text:
diff --git a/gas/testsuite/gas/mips/relax.s b/gas/testsuite/gas/mips/relax.s
new file mode 100644
index 0000000000..ca1b35677d
--- /dev/null
+++ b/gas/testsuite/gas/mips/relax.s
@@ -0,0 +1,7 @@
+# Source file used to test relaxation.
+
+	.text
+foo:
+	move    $2, $3          # just something
+        .space  0x20000         # to make a 128kb loop body
+        beq     $2, $3, foo