diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 79e532b36a..cd9d90e144 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,6 +1,6 @@
 2009-02-02  Tom Tromey  <tromey@redhat.com>
 
-	PR gdb/2489:
+	PR gdb/9594:
 	* completer.c (count_struct_fields): Count method names.
 	(add_struct_fields): Add matching method names.
 
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index aca5b5e7da..e81f304c44 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-02  Tom Tromey  <tromey@redhat.com>
+
+	* gdb.cp/cpcompletion.exp: Name the test "pr9594".
+	* gdb.cp/pr2489.cc: Rename...
+	* gdb.cp/pr9594.cc: ... to this.
+
 2009-02-02  Tom Tromey  <tromey@redhat.com>
 
 	* gdb.cp/Makefile.in (EXECUTABLES): Add pr2489.
diff --git a/gdb/testsuite/gdb.cp/Makefile.in b/gdb/testsuite/gdb.cp/Makefile.in
index 9239d70f9f..1787ad5c24 100644
--- a/gdb/testsuite/gdb.cp/Makefile.in
+++ b/gdb/testsuite/gdb.cp/Makefile.in
@@ -4,7 +4,7 @@ srcdir = @srcdir@
 EXECUTABLES = ambiguous annota2 anon-union cplusfuncs cttiadd \
 	derivation inherit local member-ptr method misc \
         overload ovldbreak ref-typ ref-typ2 templates userdef virtfunc namespace \
-	ref-types ref-params method2 pr2489
+	ref-types ref-params method2 pr9594
 
 all info install-info dvi install uninstall installcheck check:
 	@echo "Nothing to be done for $@..."
diff --git a/gdb/testsuite/gdb.cp/cpcompletion.exp b/gdb/testsuite/gdb.cp/cpcompletion.exp
index 2f715adbeb..4a5dbeb072 100644
--- a/gdb/testsuite/gdb.cp/cpcompletion.exp
+++ b/gdb/testsuite/gdb.cp/cpcompletion.exp
@@ -21,7 +21,7 @@ if $tracelevel then {
 
 if { [skip_cplus_tests] } { continue }
 
-set testfile pr2489
+set testfile pr9594
 set binfile ${objdir}/${subdir}/${testfile}
 
 if {[gdb_compile "${srcdir}/${subdir}/${testfile}.cc" "${testfile}.o" object {c++ debug}] != ""} {
diff --git a/gdb/testsuite/gdb.cp/pr2489.cc b/gdb/testsuite/gdb.cp/pr9594.cc
similarity index 100%
rename from gdb/testsuite/gdb.cp/pr2489.cc
rename to gdb/testsuite/gdb.cp/pr9594.cc