diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 1b70d3de4c..d1b0f5896f 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-13  Alan Modra  <amodra@gmail.com>
+
+	* gas/all/gas.exp: Remove some xfails on redef2 and redef3 tests.
+	Update comments.
+	* gas/hppa/unsorted/unsorted.exp: Run globalbug test on appropriate
+	targets rather than xfailing.
+
 2011-05-12  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
 
 	PR gas/12715
@@ -568,7 +575,7 @@
 2011-01-06  Paul Koning  <ni1d@arrl.net>
 
 	* gas/pdp11/pdp11.exp: Add run of absreloc.
-	
+
 2011-01-06  Paul Koning  <ni1d@arrl.net>
 
 	* gas/pdp11/absreloc.s: New.
diff --git a/gas/testsuite/gas/all/gas.exp b/gas/testsuite/gas/all/gas.exp
index c7cc452c18..7a57857da5 100644
--- a/gas/testsuite/gas/all/gas.exp
+++ b/gas/testsuite/gas/all/gas.exp
@@ -130,20 +130,22 @@ case $target_triplet in {
     { z80-*-* } { }
     default {
 	run_dump_test redef
-	# The next two tests can fail if the target does not convert fixups
-	# against ordinary symbols into relocations against section symbols.
-	# This is usually revealed by the error message:
-	#  symbol `sym' required but not present
-	setup_xfail "*arm*-*-*aout*" "*arm*-*-*coff" \
-	    "*arm*-*-pe" "m68hc*-*-*" \
-	    "rx-*-*" "vax*-*-*" "z8k-*-*"
+	# These targets fail redef2 because they disallow redefined
+	# symbols on relocs.
+	setup_xfail "m68hc*-*-*" "rx-*-*" "vax*-*-*" "z8k-*-*"
 	run_dump_test redef2
-	setup_xfail "*-*-aix*" "bfin-*-*" "hppa*-*-hpux*" \
-	    "i\[3-7\]86-*-*coff" "i\[3-7\]86-*-*pe" "i\[3-7\]86-*-go32*" \
-	    "i\[3-7\]86-*-cygwin*" "i\[3-7\]86-*-mingw*" \
-	    "x86_64-*-*coff" "x86_64-*-*pe" \
-	    "x86_64-*-cygwin*" "x86_64-*-mingw*" \
-	    "m68hc*-*-*" "or32-*-*" "rx-*-*" "vax*-*-*" "z8k-*-*"
+	setup_xfail "m68hc*-*-*" "rx-*-*" "vax*-*-*" "z8k-*-*"
+	# rs6000-aix disallows redefinition via .comm.
+	setup_xfail "*-*-aix*"
+	# SOM uses a different syntax for .comm
+	setup_xfail "hppa*-*-hpux*"
+	# These targets fail redef3 because section contents for the
+	# word referencing the .comm sym is not zero and/or its reloc
+	# has a non-zero addend.  Relaxing the test would hide real
+	# failures such as or32-elf.
+	setup_xfail "bfin-*-*" "i\[3-7\]86-*-*coff" \
+	    "i\[3-7\]86-*-*pe" "i\[3-7\]86-*-go32*" \
+	    "i\[3-7\]86-*-cygwin*" "i\[3-7\]86-*-mingw*" "86_64-*-mingw*"
 	run_dump_test redef3
 	gas_test_error "redef4.s" "" ".set for symbol already used as label"
 	gas_test_error "redef5.s" "" ".set for symbol already defined through .comm"
diff --git a/gas/testsuite/gas/hppa/unsorted/unsorted.exp b/gas/testsuite/gas/hppa/unsorted/unsorted.exp
index 83edeca4ee..92b3e58d30 100644
--- a/gas/testsuite/gas/hppa/unsorted/unsorted.exp
+++ b/gas/testsuite/gas/hppa/unsorted/unsorted.exp
@@ -245,11 +245,13 @@ if [istarget hppa*-*-*] then {
     # Test bug where switching between subspaces creates bogus alignments
     do_align4_test
 
-    # Test a problem where $global$ is defined, then used within the
-    # same source file.
-    setup_xfail hppa*-*-*
-    gas_test "globalbug.s" "" "" "Use \$global\$ in file which defines it"
-
+    if { ([istarget *-*-osf*] || [istarget *-*-hpux*] || [istarget *-*-bsd*]
+	  || [istarget *-*-mpeix*] || [istarget *-*-hiux*])
+	 && ![istarget hppa*64*-*-hpux11*] } {
+	# Test a problem where $global$ is defined, then used within the
+	# same source file.
+	gas_test "globalbug.s" "" "" "Use \$global\$ in file which defines it"
+    }
     # Test that importing a defined symbol doesn't screw up the symbol's
     # space/subspace.
     do_import_test