diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 1d5c4130dd8..d50bcde1030 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-31  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* gas/cfi/cfi.exp: Skip cfi-common-6 on hppa64*-*.
+
 2010-12-31  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	* gas/mips/e32-rel2.d: Accept any file format.
diff --git a/gas/testsuite/gas/cfi/cfi.exp b/gas/testsuite/gas/cfi/cfi.exp
index 7642e01a27c..c5e3acfeb75 100644
--- a/gas/testsuite/gas/cfi/cfi.exp
+++ b/gas/testsuite/gas/cfi/cfi.exp
@@ -100,10 +100,9 @@ if { ![istarget "hppa64*-*"] } then {
     # This test uses .subsection/.previous which are elf-specific.
     run_dump_test "cfi-common-5"
   }
+  # MIPS doesn't support PC relative cfi directives.
+  if { ![istarget "mips*-*"] } then {
+    run_dump_test "cfi-common-6"
+  }
   run_dump_test "cfi-common-7"
 }
-
-# MIPS doesn't support PC relative cfi directives.
-if { ![istarget "mips*-*"] } then {
-    run_dump_test "cfi-common-6"
-}