diff --git a/ChangeLog b/ChangeLog
index 0c7cbd6822..3904e2b404 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Nov 18 11:24:33 UTC 2007 Daniel P. Berrange <berrange@redhat.com>
+
+	* tests/Makefile.am: Re-add quotes around top_{src,build}dir
+	variables
+
 Sat Nov 17 13:05:33 UTC 2007 Daniel P. Berrange <berrange@redhat.com>
 
 	* tests/Makefile.am: Set abs_top_{build,src}dir based on 'pwd'
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8539779fcc..d05940238c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -56,8 +56,8 @@ endif
 # abs_top_{src/build}dir variables, so don't rely
 # on them here. Fake them with 'pwd'
 TESTS_ENVIRONMENT =				\
-  abs_top_builddir=`pwd`/$(top_builddir)	\
-  abs_top_srcdir=`pwd`/$(top_srcdir)		\
+  abs_top_builddir=`pwd`/'$(top_builddir)'	\
+  abs_top_srcdir=`pwd`/'$(top_srcdir)'		\
   $(VG)
 
 valgrind: