diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am
index ad47d2827a..38e34c055f 100644
--- a/gold/testsuite/Makefile.am
+++ b/gold/testsuite/Makefile.am
@@ -115,9 +115,9 @@ object_unittest_SOURCES = object_unittest.cc
 if GCC
 
 debug_msg.o: debug_msg.cc
-	$(CXXCOMPILE) -O0 -c -w -o $@ $(srcdir)/debug_msg.cc
+	$(CXXCOMPILE) -O0 -g -c -w -o $@ $(srcdir)/debug_msg.cc
 debug_msg.err: debug_msg.o
-	if $(CXXLINK) -Bgcctestdir/ -o debug_msg debug_msg.o 2>debug_msg.err; \
+	if $(CXXLINK) -Bgcctestdir/ -o debug_msg debug_msg.o 2>$@; \
 	then \
 	  echo 2>&1 "Link of debug_msg.o should have failed"; \
 	  exit 1; \
diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in
index 2587b682d7..5e3b60768c 100644
--- a/gold/testsuite/Makefile.in
+++ b/gold/testsuite/Makefile.in
@@ -1169,9 +1169,9 @@ uninstall-am: uninstall-info-am
 
 
 @GCC_TRUE@debug_msg.o: debug_msg.cc
-@GCC_TRUE@	$(CXXCOMPILE) -O0 -c -w -o $@ $(srcdir)/debug_msg.cc
+@GCC_TRUE@	$(CXXCOMPILE) -O0 -g -c -w -o $@ $(srcdir)/debug_msg.cc
 @GCC_TRUE@debug_msg.err: debug_msg.o
-@GCC_TRUE@	if $(CXXLINK) -Bgcctestdir/ -o debug_msg debug_msg.o 2>debug_msg.err; \
+@GCC_TRUE@	if $(CXXLINK) -Bgcctestdir/ -o debug_msg debug_msg.o 2>$@; \
 @GCC_TRUE@	then \
 @GCC_TRUE@	  echo 2>&1 "Link of debug_msg.o should have failed"; \
 @GCC_TRUE@	  exit 1; \