diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a39c76e472..285f8424e5 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-12  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.cp/namespace-enum.exp (executable): New variable.
+	(binfile): Use ${objdir}/${subdir}/ prefix.
+	Use ${executable} for clean_restart.
+
 2011-10-11  Sterling Augustine  <saugustine@google.com>
 
 	* gdb.cp/Makefile.in: Add namespace-enum test.
diff --git a/gdb/testsuite/gdb.cp/namespace-enum.exp b/gdb/testsuite/gdb.cp/namespace-enum.exp
index a8b26ec9cf..f1d4ff14b9 100644
--- a/gdb/testsuite/gdb.cp/namespace-enum.exp
+++ b/gdb/testsuite/gdb.cp/namespace-enum.exp
@@ -18,7 +18,8 @@ set srcfile0 ${testfile}.cc
 set objfile0 ${testfile}.o
 set srcfile1 ${testfile}-main.cc
 set objfile1 ${testfile}-main.o
-set binfile ${testfile}
+set executable ${testfile}
+set binfile ${objdir}/${subdir}/${executable}
 
 if  { [gdb_compile "$srcdir/$subdir/$srcfile0" "$objdir/$subdir/$objfile0" object {debug c++}] != "" } {
      untested namespace-enum.exp
@@ -35,7 +36,7 @@ if  { [gdb_compile "$objdir/$subdir/$objfile0 $objdir/$subdir/$objfile1" "${binf
      return -1
 }
 
-clean_restart ${binfile}
+clean_restart ${executable}
 gdb_test "print foo::B::B_B" "`foo::B' is not defined as an aggregate type."
 gdb_test "print foo::B_B" "foo::B_B"
 gdb_test "print A_A" "A_A"