diff --git a/t/merge-check.t b/t/merge-check.t
index b2642ed..443a848 100755
--- a/t/merge-check.t
+++ b/t/merge-check.t
@@ -34,7 +34,7 @@ try "
 try "
     cd foo;             ok
     ls -Al;             ok;     /\.git/
-    test-commit aa;     ok;     /1 files changed, 1 insertions/
+    test-commit aa;     ok;     /1 file changed, 1 insertion/
     tag start;          ok
     glt push u1 origin master
                         ok;     /new branch.*master.-..master/
diff --git a/t/smart-http.root-setup b/t/smart-http.root-setup
index dd42ad9..310efa3 100755
--- a/t/smart-http.root-setup
+++ b/t/smart-http.root-setup
@@ -68,13 +68,14 @@ SetEnv GIT_HTTP_EXPORT_ALL
     AuthType Basic
     AuthName "Private Git Access"
     Require valid-user
-    AuthUserFile /tmp/gitolite-http-authuserfile
+    AuthUserFile $GITOLITE_HTTP_HOME/gitolite-http-authuserfile
 </Location>
 EOF1
 
 # NOTE: this is for testing only
-htpasswd -bc /tmp/gitolite-http-authuserfile admin admin
-map "htpasswd -b /tmp/gitolite-http-authuserfile % %" u{1..6}
+htpasswd -bc $GITOLITE_HTTP_HOME/gitolite-http-authuserfile admin admin
+map "htpasswd -b $GITOLITE_HTTP_HOME/gitolite-http-authuserfile % %" u{1..6}
+chown apache.apache $GITOLITE_HTTP_HOME/gitolite-http-authuserfile
 
 # restart httpd to make it pick up all the new stuff
 service httpd restart