diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 0cd8df59bf..9b3c6d30ce 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2012-06-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gas/all/gas.exp: Don't run rept.
+
+	* gas/all/rept.d: Moved to ...
+	* gas/i386/rept.d: Here.
+	* gas/all/rept.s: Moved to ...
+	* gas/i386/rept.s: Here.
+
+	* gas/i386/i386.exp: Run rept.
+
 2012-06-07  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR gas/14201
diff --git a/gas/testsuite/gas/all/gas.exp b/gas/testsuite/gas/all/gas.exp
index 079b74613f..2cef5ddd59 100644
--- a/gas/testsuite/gas/all/gas.exp
+++ b/gas/testsuite/gas/all/gas.exp
@@ -400,7 +400,6 @@ gas_test_error "weakref3.s" "" "a: would close weakref loop: a => b => c => d =>
 gas_test_error "weakref4.s" "" "is already defined"
 
 run_dump_test string
-run_dump_test rept
 
 load_lib gas-dg.exp
 dg-init
diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp
index fc67db08e6..89adf696a0 100644
--- a/gas/testsuite/gas/i386/i386.exp
+++ b/gas/testsuite/gas/i386/i386.exp
@@ -274,6 +274,7 @@ if [expr [istarget "i*86-*-*"] || [istarget "x86_64-*-*"]] then {
     run_dump_test "string-ok"
     run_list_test "string-bad" ""
     run_list_test "space1" "-al"
+    run_dump_test rept
     if [is_elf_format] then {
 	run_list_test_stdin "list-1" "-al"
 	run_list_test_stdin "list-2" "-al"
diff --git a/gas/testsuite/gas/all/rept.d b/gas/testsuite/gas/i386/rept.d
similarity index 100%
rename from gas/testsuite/gas/all/rept.d
rename to gas/testsuite/gas/i386/rept.d
diff --git a/gas/testsuite/gas/all/rept.s b/gas/testsuite/gas/i386/rept.s
similarity index 100%
rename from gas/testsuite/gas/all/rept.s
rename to gas/testsuite/gas/i386/rept.s