diff --git a/macros.in b/macros.in
index 3c5081a0e..cda4c61d9 100644
--- a/macros.in
+++ b/macros.in
@@ -41,7 +41,7 @@
 %_buildos		Linux
 %_bzip2bin		@BZIP2BIN@
 %_dbpath		%{_var}/lib/rpm
-%_defaultdocdir		%{_usr}/doc
+%_defaultdocdir		/usr/doc
 %_fixperms		@FIXPERMS@
 %_gzipbin		@GZIPBIN@
 %_rpmdir		%{_topdir}/RPMS
diff --git a/tests/hello-test/ckC.exp b/tests/hello-test/ckC.exp
index dc1491ac4..b956c266e 100644
--- a/tests/hello-test/ckC.exp
+++ b/tests/hello-test/ckC.exp
@@ -1,3 +1,3 @@
-home/devel/jbj/src/rpm/tests/usr/doc/hello-1.0
-home/devel/jbj/src/rpm/tests/usr/doc/hello-1.0/FAQ
+usr/doc/hello-1.0
+usr/doc/hello-1.0/FAQ
 usr/local/bin/hello
diff --git a/tests/macros.in b/tests/macros.in
index 63de2f4f3..e931638a1 100644
--- a/tests/macros.in
+++ b/tests/macros.in
@@ -41,7 +41,7 @@
 %_buildos		Linux
 %_bzip2bin		@BZIP2BIN@
 %_dbpath		%{_var}/lib/rpm
-%_defaultdocdir		%{_usr}/doc
+%_defaultdocdir		/usr/doc
 %_fixperms		@FIXPERMS@
 %_gzipbin		@GZIPBIN@
 %_rpmdir		%{_topdir}/RPMS
diff --git a/tests/rpmrc.in b/tests/rpmrc.in
index 68e348d2d..2825ed81d 100644
--- a/tests/rpmrc.in
+++ b/tests/rpmrc.in
@@ -11,7 +11,7 @@ topdir:		@testdir@@prefix@/src/redhat
 tmppath:	@testdir@@tmpdir@
 gzipbin:	@testdir@@GZIPBIN@
 bzip2bin:	@testdir@@BZIP2BIN@
-defaultdocdir:  @testdir@@prefix@/doc
+defaultdocdir:  @prefix@/doc
 fixperms:	a+rX,g-w,o-w
 rpmfilename:    %{ARCH}/%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm
 instchangelog:	5