diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 6d5938967d..92c0d657c6 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* gas/i386/divide.s: Test line comment starting with '/'.
+	* gas/i386/divide.d: Pass --divide to gas.
+	* gas/i386/intelok.d: Likewise.
+	* gas/i386/i386.exp (divide): Run for all targets.
+
 2005-11-07  Arnold Metselaar <arnold.metselaar@planet.nl>
 
 	* gas/z80/z80.exp: Added "suffix" test.
diff --git a/gas/testsuite/gas/i386/divide.d b/gas/testsuite/gas/i386/divide.d
index be54254be4..1087426465 100644
--- a/gas/testsuite/gas/i386/divide.d
+++ b/gas/testsuite/gas/i386/divide.d
@@ -1,3 +1,4 @@
+#as: --divide
 #objdump: -s
 #name: i386 divide
 
diff --git a/gas/testsuite/gas/i386/divide.s b/gas/testsuite/gas/i386/divide.s
index 6a22dedae5..17433db788 100644
--- a/gas/testsuite/gas/i386/divide.s
+++ b/gas/testsuite/gas/i386/divide.s
@@ -1,4 +1,6 @@
 start:
  .long 1,2,3,a,b
- a=(.-start)/4-1
+/ This comment should still be allowed with --divide,
+/ but the divide must remain a divide in the next line
+a=(.-start)/4-1 # comment
 b=(.-start)/4
diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp
index face82408f..d536da333f 100644
--- a/gas/testsuite/gas/i386/i386.exp
+++ b/gas/testsuite/gas/i386/i386.exp
@@ -32,7 +32,6 @@ proc gas_32_check { } {
     return [regexp "targets:.*i386" $nm_help]
 }
 
-
 if [expr ([istarget "i*86-*-*"] ||  [istarget "x86_64-*-*"]) && [gas_32_check]]  then {
 
     global ASFLAGS
@@ -64,17 +63,7 @@ if [expr ([istarget "i*86-*-*"] ||  [istarget "x86_64-*-*"]) && [gas_32_check]]
     run_dump_test "suffix"
     run_dump_test "immed32"
     run_dump_test "equ"
-
-    if {![istarget "*-*-aix*"]
-	&& (![is_elf_format] || [istarget "*-*-linux*"]
-	    || [istarget "*-*-netbsd*"]
-	    || [istarget "*-*-freebsd*"]
-	    || [istarget "*-*-netware*"]
-	    || [istarget "*-*-vxworks*"])} {
-	# Don't run this test on targets where '/' starts comments.
-	run_dump_test "divide"
-    }
-
+    run_dump_test "divide"
     run_dump_test "padlock"
     run_dump_test "crx"
     run_list_test "cr-err" ""
diff --git a/gas/testsuite/gas/i386/intelok.d b/gas/testsuite/gas/i386/intelok.d
index af71b8988e..8e7fdbf754 100644
--- a/gas/testsuite/gas/i386/intelok.d
+++ b/gas/testsuite/gas/i386/intelok.d
@@ -1,4 +1,4 @@
-#as: -J
+#as: -J --divide
 #objdump: -dwMintel
 #name: i386 intel-ok
 #stderr: intelok.e