diff --git a/t/t10-all-yall b/t/t10-all-yall
index 805278a..a3e1f54 100644
--- a/t/t10-all-yall
+++ b/t/t10-all-yall
@@ -1,7 +1,7 @@
 # vim: syn=sh:
 has_export_ok() {
     runremote ls -al $TEST_BASE_FULL/$1.git/git-daemon-export-ok
-    expect "gitolite-test gitolite-test .* $TEST_BASE_FULL/$1.git/git-daemon-export-ok"
+    expect "$USER $USER .* $TEST_BASE_FULL/$1.git/git-daemon-export-ok"
 }
 
 does_not_have_export_ok() {
diff --git a/t/t11-deny-repo b/t/t11-deny-repo
index 673a80d..6974003 100644
--- a/t/t11-deny-repo
+++ b/t/t11-deny-repo
@@ -44,7 +44,7 @@ cannot_push() {
 
 has_export_ok() {
     runremote ls -al $TEST_BASE_FULL/$1.git/git-daemon-export-ok
-    expect "gitolite-test gitolite-test .* $TEST_BASE_FULL/$1.git/git-daemon-export-ok"
+    expect "$USER $USER .* $TEST_BASE_FULL/$1.git/git-daemon-export-ok"
 }
 
 does_not_have_export_ok() {
diff --git a/t/t57-daemon-gitweb b/t/t57-daemon-gitweb
index 52701d0..ff23f22 100644
--- a/t/t57-daemon-gitweb
+++ b/t/t57-daemon-gitweb
@@ -17,7 +17,7 @@ do
             name "daemon access for testing repo"
             runremote ls -al $TEST_BASE/testing.git/git-daemon-export-ok
             [ "$ais" = "0" ] && expect "ls: cannot access $TEST_BASE/testing.git/git-daemon-export-ok: No such file or directory"
-            [ "$ais" = "1" ] && expect "gitolite-test gitolite-test .* $TEST_BASE/testing.git/git-daemon-export-ok"
+            [ "$ais" = "1" ] && expect "$USER $USER .* $TEST_BASE/testing.git/git-daemon-export-ok"
 
             name "INTERNAL"
             echo "
@@ -33,8 +33,8 @@ do
             runremote ls -al $TEST_BASE/bar.git/git-daemon-export-ok
             expect "ls: cannot access $TEST_BASE/bar.git/git-daemon-export-ok: No such file or directory"
             runremote ls -al projects.list
-            [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 0 .* projects.list"
-            [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 12 .* projects.list"
+            [ "$ais" = "0" ] && expect "$USER $USER 0 .* projects.list"
+            [ "$ais" = "1" ] && expect "$USER $USER 12 .* projects.list"
             runremote cat projects.list
             [ "$ais" = "0" ] && notexpect "testing.git"
             [ "$ais" = "1" ] && expect "testing.git"
@@ -44,10 +44,10 @@ do
                     R               =   daemon
             " | ugc
             runremote ls -al $TEST_BASE/bar.git/git-daemon-export-ok
-            expect "gitolite-test gitolite-test .* $TEST_BASE/bar.git/git-daemon-export-ok"
+            expect "$USER $USER .* $TEST_BASE/bar.git/git-daemon-export-ok"
             runremote ls -al projects.list
-            [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 0 .* projects.list"
-            [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 12 .* projects.list"
+            [ "$ais" = "0" ] && expect "$USER $USER 0 .* projects.list"
+            [ "$ais" = "1" ] && expect "$USER $USER 12 .* projects.list"
 
             name "add foo with gitweb access"
             echo "
@@ -62,8 +62,8 @@ do
             " | ugc
             expect_push_ok "master -> master"
             runremote ls -al projects.list
-            [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 8 .* projects.list"
-            [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 20 .* projects.list"
+            [ "$ais" = "0" ] && expect "$USER $USER 8 .* projects.list"
+            [ "$ais" = "1" ] && expect "$USER $USER 20 .* projects.list"
             runremote cat projects.list
             [ "$ais" = "0" ] && notexpect "testing.git"
             [ "$ais" = "1" ] && expect "testing.git"
@@ -76,8 +76,8 @@ do
             " | ugc
             expect_push_ok "master -> master"
             runremote ls -al projects.list
-            [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 16 .* projects.list"
-            [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 28 .* projects.list"
+            [ "$ais" = "0" ] && expect "$USER $USER 16 .* projects.list"
+            [ "$ais" = "1" ] && expect "$USER $USER 28 .* projects.list"
             runremote cat projects.list
             [ "$ais" = "0" ] && notexpect "testing.git"
             [ "$ais" = "1" ] && expect "testing.git"
@@ -95,8 +95,8 @@ do
             expect_push_ok "master -> master"
             expect "remote: Initialized empty Git repository in $TEST_BASE_FULL/baz.git/"
             runremote ls -al projects.list
-            [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 24 .* projects.list"
-            [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 36 .* projects.list"
+            [ "$ais" = "0" ] && expect "$USER $USER 24 .* projects.list"
+            [ "$ais" = "1" ] && expect "$USER $USER 36 .* projects.list"
             runremote cat projects.list
             [ "$ais" = "0" ] && notexpect "testing.git"
             [ "$ais" = "1" ] && expect "testing.git"
@@ -104,7 +104,7 @@ do
             expect "bar.git"
             expect "baz.git"
             runremote ls -al $TEST_BASE/baz.git/description
-            expect "gitolite-test gitolite-test 17 .* $TEST_BASE/baz.git/description"
+            expect "$USER $USER 17 .* $TEST_BASE/baz.git/description"
             runremote cat $TEST_BASE/baz.git/description
             expect "this is repo baz"
 
@@ -114,7 +114,7 @@ do
             " | ugc
             expect_push_ok "master -> master"
             runremote ls -al projects.list
-            expect "gitolite-test gitolite-test 36 .* projects.list"
+            expect "$USER $USER 36 .* projects.list"
             runremote cat projects.list
             expect "testing.git"
             expect "foo.git"
@@ -124,7 +124,7 @@ do
             expect "\[gitweb\]"
             expect "owner = sitaram"
             runremote ls -al $TEST_BASE/testing.git/description
-            expect "gitolite-test gitolite-test 25 .* $TEST_BASE/testing.git/description"
+            expect "$USER $USER 25 .* $TEST_BASE/testing.git/description"
             runremote cat $TEST_BASE/testing.git/description
             expect "this is the testing repo"
 
diff --git a/t/t58-daemon-gitweb-wild b/t/t58-daemon-gitweb-wild
index b5ed6ed..f76b6c8 100644
--- a/t/t58-daemon-gitweb-wild
+++ b/t/t58-daemon-gitweb-wild
@@ -27,8 +27,8 @@ do
         runremote ls -al $TEST_BASE/bar/u1/try1.git/git-daemon-export-ok
         expect "ls: cannot access $TEST_BASE/bar/u1/try1.git/git-daemon-export-ok: No such file or directory"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 0 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 12 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 0 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 12 .* projects.list"
         runremote cat projects.list
         [ "$ais" = "0" ] && notexpect "testing.git"
         [ "$ais" = "1" ] && expect "testing.git"
@@ -39,18 +39,18 @@ do
                 R               =   daemon
         " | ugc
         runremote ls -al $TEST_BASE/bar/u1/try1.git/git-daemon-export-ok
-        expect "gitolite-test gitolite-test .* $TEST_BASE/bar/u1/try1.git/git-daemon-export-ok"
+        expect "$USER $USER .* $TEST_BASE/bar/u1/try1.git/git-daemon-export-ok"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 0 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 12 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 0 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 12 .* projects.list"
 
         name "add one more repo"
         runlocal git ls-remote u1:bar/u1/try2
         runremote ls -al $TEST_BASE/bar/u1/try2.git/git-daemon-export-ok
-        expect "gitolite-test gitolite-test .* $TEST_BASE/bar/u1/try2.git/git-daemon-export-ok"
+        expect "$USER $USER .* $TEST_BASE/bar/u1/try2.git/git-daemon-export-ok"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 0 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 12 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 0 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 12 .* projects.list"
         runremote cat projects.list
         [ "$ais" = "0" ] && notexpect "testing.git"
         [ "$ais" = "1" ] && expect "testing.git"
@@ -63,8 +63,8 @@ do
             bar/u1/try3 = \"this is bar/u1/try3\"
         " | ugc
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 16 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 28 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 16 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 28 .* projects.list"
         runremote cat projects.list
         [ "$ais" = "0" ] && notexpect "testing.git"
         [ "$ais" = "1" ] && expect "testing.git"
@@ -77,10 +77,10 @@ do
         name "add try3 project"
         runlocal git ls-remote u1:bar/u1/try3
         runremote ls -al $TEST_BASE/bar/u1/try3.git/git-daemon-export-ok
-        expect "gitolite-test gitolite-test .* $TEST_BASE/bar/u1/try3.git/git-daemon-export-ok"
+        expect "$USER $USER .* $TEST_BASE/bar/u1/try3.git/git-daemon-export-ok"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 16 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 28 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 16 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 28 .* projects.list"
         runremote cat projects.list
         [ "$ais" = "0" ] && notexpect "testing.git"
         [ "$ais" = "1" ] && expect "testing.git"
@@ -96,10 +96,10 @@ do
         echo "
         " | ugc
         runremote ls -al $TEST_BASE/bar/u1/try3.git/git-daemon-export-ok
-        expect "gitolite-test gitolite-test .* $TEST_BASE/bar/u1/try3.git/git-daemon-export-ok"
+        expect "$USER $USER .* $TEST_BASE/bar/u1/try3.git/git-daemon-export-ok"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 32 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 44 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 32 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 44 .* projects.list"
         runremote cat projects.list
         [ "$ais" = "0" ] && notexpect "testing.git"
         [ "$ais" = "1" ] && expect "testing.git"
@@ -119,8 +119,8 @@ do
         expect "\[gitweb\]"
         expect "owner = owner2"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 48 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 60 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 48 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 60 .* projects.list"
         runremote cat projects.list
         expect "bar/u1/try2.git"
 
@@ -131,8 +131,8 @@ do
         " | ugc
         expect_push_ok "master -> master"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 48 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 60 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 48 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 60 .* projects.list"
         runremote cat projects.list
         [ "$ais" = "0" ] && notexpect "testing.git"
         [ "$ais" = "1" ] && expect "testing.git"
@@ -143,8 +143,8 @@ do
         name "add try4 project"
         runlocal git ls-remote u1:bar/u1/try4
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 64 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 76 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 64 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 76 .* projects.list"
         runremote cat projects.list
         [ "$ais" = "0" ] && notexpect "testing.git"
         [ "$ais" = "1" ] && expect "testing.git"
@@ -188,8 +188,8 @@ do
         runremote ls -al $TEST_BASE/bar/u1/try1.git/git-daemon-export-ok
         expect "ls: cannot access $TEST_BASE/bar/u1/try1.git/git-daemon-export-ok: No such file or directory"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 0 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 12 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 0 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 12 .* projects.list"
         runremote cat projects.list
         [ "$ais" = "0" ] && notexpect "testing.git"
         [ "$ais" = "1" ] && expect "testing.git"
@@ -200,18 +200,18 @@ do
                 R               =   daemon
         " | ugc
         runremote ls -al $TEST_BASE/bar/u1/try1.git/git-daemon-export-ok
-        expect "gitolite-test gitolite-test .* $TEST_BASE/bar/u1/try1.git/git-daemon-export-ok"
+        expect "$USER $USER .* $TEST_BASE/bar/u1/try1.git/git-daemon-export-ok"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 0 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 12 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 0 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 12 .* projects.list"
 
         name "add one more repo"
         runlocal git ls-remote u1:bar/u1/try2
         runremote ls -al $TEST_BASE/bar/u1/try2.git/git-daemon-export-ok
-        expect "gitolite-test gitolite-test .* $TEST_BASE/bar/u1/try2.git/git-daemon-export-ok"
+        expect "$USER $USER .* $TEST_BASE/bar/u1/try2.git/git-daemon-export-ok"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 0 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 12 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 0 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 12 .* projects.list"
         runremote cat projects.list
         [ "$ais" = "0" ] && notexpect "testing.git"
         [ "$ais" = "1" ] && expect "testing.git"
@@ -224,8 +224,8 @@ do
             bar/u1/try3 = \"this is bar/u1/try3\"
         " | ugc
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 20 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 32 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 20 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 32 .* projects.list"
         runremote cat projects.list
         [ "$ais" = "0" ] && notexpect "testing.git"
         [ "$ais" = "1" ] && expect "testing.git"
@@ -241,10 +241,10 @@ do
         name "add try3 project"
         runlocal git ls-remote u1:bar/u1/try3
         runremote ls -al $TEST_BASE/bar/u1/try3.git/git-daemon-export-ok
-        expect "gitolite-test gitolite-test .* $TEST_BASE/bar/u1/try3.git/git-daemon-export-ok"
+        expect "$USER $USER .* $TEST_BASE/bar/u1/try3.git/git-daemon-export-ok"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 20 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 32 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 20 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 32 .* projects.list"
         runremote cat projects.list
         [ "$ais" = "0" ] && notexpect "testing.git"
         [ "$ais" = "1" ] && expect "testing.git"
@@ -263,10 +263,10 @@ do
         echo "
         " | ugc
         runremote ls -al $TEST_BASE/bar/u1/try3.git/git-daemon-export-ok
-        expect "gitolite-test gitolite-test .* $TEST_BASE/bar/u1/try3.git/git-daemon-export-ok"
+        expect "$USER $USER .* $TEST_BASE/bar/u1/try3.git/git-daemon-export-ok"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 40 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 52 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 40 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 52 .* projects.list"
         runremote cat projects.list
         [ "$ais" = "0" ] && notexpect "testing.git"
         [ "$ais" = "1" ] && expect "testing.git"
@@ -289,8 +289,8 @@ do
         expect "\[gitweb\]"
         expect "owner = owner2"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 60 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 72 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 60 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 72 .* projects.list"
         runremote cat projects.list
         expect "bar%2Fu1%2Ftry2.git"
 
@@ -301,8 +301,8 @@ do
         " | ugc
         expect_push_ok "master -> master"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 60 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 72 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 60 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 72 .* projects.list"
         runremote cat projects.list
         [ "$ais" = "0" ] && notexpect "testing.git"
         [ "$ais" = "1" ] && expect "testing.git"
@@ -313,8 +313,8 @@ do
         name "add try4 project"
         runlocal git ls-remote u1:bar/u1/try4
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 80 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 92 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 80 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 92 .* projects.list"
         runremote cat projects.list
         [ "$ais" = "0" ] && notexpect "testing.git"
         [ "$ais" = "1" ] && expect "testing.git"
diff --git a/t/t60-daemon-gitweb-via-setperms b/t/t60-daemon-gitweb-via-setperms
index c1bea6b..489554c 100644
--- a/t/t60-daemon-gitweb-via-setperms
+++ b/t/t60-daemon-gitweb-via-setperms
@@ -28,8 +28,8 @@ do
         runremote ls -al $TEST_BASE/bar/u1/try1.git/git-daemon-export-ok
         expect "ls: cannot access $TEST_BASE/bar/u1/try1.git/git-daemon-export-ok: No such file or directory"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 0 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 12 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 0 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 12 .* projects.list"
         runremote cat projects.list
         notexpect "bar/u1/try1.git"
 
@@ -37,8 +37,8 @@ do
         runremote ls -al $TEST_BASE/bar/u1/try2.git/git-daemon-export-ok
         expect "ls: cannot access $TEST_BASE/bar/u1/try2.git/git-daemon-export-ok: No such file or directory"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 0 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 12 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 0 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 12 .* projects.list"
         runremote cat projects.list
         notexpect "bar/u1/try2.git"
 
@@ -47,10 +47,10 @@ do
         expect "READERS daemon"
 
         runremote ls -al $TEST_BASE/bar/u1/try1.git/git-daemon-export-ok
-        expect "gitolite-test gitolite-test .* $TEST_BASE/bar/u1/try1.git/git-daemon-export-ok"
+        expect "$USER $USER .* $TEST_BASE/bar/u1/try1.git/git-daemon-export-ok"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 0 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 12 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 0 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 12 .* projects.list"
         runremote cat projects.list
         notexpect "bar/u1/try1.git"
 
@@ -61,8 +61,8 @@ do
         runremote ls -al $TEST_BASE/bar/u1/try2.git/git-daemon-export-ok
         expect "ls: cannot access $TEST_BASE/bar/u1/try2.git/git-daemon-export-ok: No such file or directory"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 16 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 28 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 16 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 28 .* projects.list"
         runremote cat projects.list
         expect "bar/u1/try2.git"
 
@@ -71,10 +71,10 @@ do
         name "add default daemon access"
         runlocal git ls-remote u1:bar/u1/try3
         runremote ls -al $TEST_BASE/bar/u1/try3.git/git-daemon-export-ok
-        expect "gitolite-test gitolite-test .* $TEST_BASE/bar/u1/try3.git/git-daemon-export-ok"
+        expect "$USER $USER .* $TEST_BASE/bar/u1/try3.git/git-daemon-export-ok"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 16 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 28 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 16 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 28 .* projects.list"
         runremote cat projects.list
         notexpect "bar/u1/try3.git"
 
@@ -85,8 +85,8 @@ do
         runremote ls -al $TEST_BASE/bar/u1/try4.git/git-daemon-export-ok
         expect "ls: cannot access $TEST_BASE/bar/u1/try4.git/git-daemon-export-ok: No such file or directory"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 32 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 44 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 32 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 44 .* projects.list"
         runremote cat projects.list
         expect "bar/u1/try4.git"
 
@@ -95,10 +95,10 @@ do
 
         runlocal git ls-remote u1:bar/u1/try5
         runremote ls -al $TEST_BASE/bar/u1/try5.git/git-daemon-export-ok
-        expect "gitolite-test gitolite-test .* $TEST_BASE/bar/u1/try5.git/git-daemon-export-ok"
+        expect "$USER $USER .* $TEST_BASE/bar/u1/try5.git/git-daemon-export-ok"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 48 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 60 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 48 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 60 .* projects.list"
         runremote cat projects.list
         expect "bar/u1/try5.git"
 
@@ -107,10 +107,10 @@ do
 
         runlocal git ls-remote u1:bar/u1/try6
         runremote ls -al $TEST_BASE/bar/u1/try6.git/git-daemon-export-ok
-        expect "gitolite-test gitolite-test .* $TEST_BASE/bar/u1/try6.git/git-daemon-export-ok"
+        expect "$USER $USER .* $TEST_BASE/bar/u1/try6.git/git-daemon-export-ok"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 64 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 76 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 64 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 76 .* projects.list"
         runremote cat projects.list
         expect "bar/u1/try6.git"
 
@@ -121,8 +121,8 @@ do
         runremote ls -al $TEST_BASE/bar/u1/try6.git/git-daemon-export-ok
         expect "ls: cannot access $TEST_BASE/bar/u1/try6.git/git-daemon-export-ok: No such file or directory"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 48 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 60 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 48 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 60 .* projects.list"
         runremote cat projects.list
         notexpect "bar/u1/try6.git"
 
@@ -132,10 +132,10 @@ do
         runlocal git ls-remote u1:bar/u1/try7
         runremote ls -al $TEST_BASE/bar/u1/try7.git/git-daemon-export-ok
         [ "$ais" = "0" ] && expect "ls: cannot access $TEST_BASE/bar/u1/try7.git/git-daemon-export-ok: No such file or directory"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test .* $TEST_BASE/bar/u1/try7.git/git-daemon-export-ok"
+        [ "$ais" = "1" ] && expect "$USER $USER .* $TEST_BASE/bar/u1/try7.git/git-daemon-export-ok"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 48 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 76 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 48 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 76 .* projects.list"
         runremote cat projects.list
         [ "$ais" = "0" ] && notexpect "bar/u1/try7.git"
         [ "$ais" = "1" ] && expect "bar/u1/try7.git"
@@ -145,10 +145,10 @@ do
 
         runlocal git ls-remote u1:bar/u1/try8
         runremote ls -al $TEST_BASE/bar/u1/try8.git/git-daemon-export-ok
-        expect "gitolite-test gitolite-test .* $TEST_BASE/bar/u1/try8.git/git-daemon-export-ok"
+        expect "$USER $USER .* $TEST_BASE/bar/u1/try8.git/git-daemon-export-ok"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 48 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 76 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 48 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 76 .* projects.list"
         runremote cat projects.list
         notexpect "bar/u1/try8.git"
 
@@ -159,8 +159,8 @@ do
         runremote ls -al $TEST_BASE/bar/u1/try9.git/git-daemon-export-ok
         expect "ls: cannot access $TEST_BASE/bar/u1/try9.git/git-daemon-export-ok: No such file or directory"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 64 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 92 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 64 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 92 .* projects.list"
         runremote cat projects.list
         expect "bar/u1/try9.git"
 
@@ -199,8 +199,8 @@ do
         runremote ls -al $TEST_BASE/bar/u1/try1.git/git-daemon-export-ok
         expect "ls: cannot access $TEST_BASE/bar/u1/try1.git/git-daemon-export-ok: No such file or directory"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 0 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 12 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 0 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 12 .* projects.list"
         runremote cat projects.list
         notexpect "bar/u1/try1.git"
 
@@ -208,8 +208,8 @@ do
         runremote ls -al $TEST_BASE/bar/u1/try2.git/git-daemon-export-ok
         expect "ls: cannot access $TEST_BASE/bar/u1/try2.git/git-daemon-export-ok: No such file or directory"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 0 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 12 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 0 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 12 .* projects.list"
         runremote cat projects.list
         notexpect "bar/u1/try2.git"
 
@@ -218,10 +218,10 @@ do
         expect "READERS daemon"
 
         runremote ls -al $TEST_BASE/bar/u1/try1.git/git-daemon-export-ok
-        expect "gitolite-test gitolite-test .* $TEST_BASE/bar/u1/try1.git/git-daemon-export-ok"
+        expect "$USER $USER .* $TEST_BASE/bar/u1/try1.git/git-daemon-export-ok"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 0 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 12 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 0 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 12 .* projects.list"
         runremote cat projects.list
         notexpect "bar/u1/try1.git"
 
@@ -232,8 +232,8 @@ do
         runremote ls -al $TEST_BASE/bar/u1/try2.git/git-daemon-export-ok
         expect "ls: cannot access $TEST_BASE/bar/u1/try2.git/git-daemon-export-ok: No such file or directory"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 20 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 32 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 20 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 32 .* projects.list"
         runremote cat projects.list
         expect "bar%2Fu1%2Ftry2.git"
 
@@ -242,10 +242,10 @@ do
         name "add default daemon access"
         runlocal git ls-remote u1:bar/u1/try3
         runremote ls -al $TEST_BASE/bar/u1/try3.git/git-daemon-export-ok
-        expect "gitolite-test gitolite-test .* $TEST_BASE/bar/u1/try3.git/git-daemon-export-ok"
+        expect "$USER $USER .* $TEST_BASE/bar/u1/try3.git/git-daemon-export-ok"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 20 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 32 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 20 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 32 .* projects.list"
         runremote cat projects.list
         notexpect "bar%2Fu1%2Ftry3.git"
 
@@ -256,8 +256,8 @@ do
         runremote ls -al $TEST_BASE/bar/u1/try4.git/git-daemon-export-ok
         expect "ls: cannot access $TEST_BASE/bar/u1/try4.git/git-daemon-export-ok: No such file or directory"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 40 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 52 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 40 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 52 .* projects.list"
         runremote cat projects.list
         expect "bar%2Fu1%2Ftry4.git"
 
@@ -266,10 +266,10 @@ do
 
         runlocal git ls-remote u1:bar/u1/try5
         runremote ls -al $TEST_BASE/bar/u1/try5.git/git-daemon-export-ok
-        expect "gitolite-test gitolite-test .* $TEST_BASE/bar/u1/try5.git/git-daemon-export-ok"
+        expect "$USER $USER .* $TEST_BASE/bar/u1/try5.git/git-daemon-export-ok"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 60 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 72 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 60 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 72 .* projects.list"
         runremote cat projects.list
         expect "bar%2Fu1%2Ftry5.git"
 
@@ -278,10 +278,10 @@ do
 
         runlocal git ls-remote u1:bar/u1/try6
         runremote ls -al $TEST_BASE/bar/u1/try6.git/git-daemon-export-ok
-        expect "gitolite-test gitolite-test .* $TEST_BASE/bar/u1/try6.git/git-daemon-export-ok"
+        expect "$USER $USER .* $TEST_BASE/bar/u1/try6.git/git-daemon-export-ok"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 80 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 92 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 80 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 92 .* projects.list"
         runremote cat projects.list
         expect "bar%2Fu1%2Ftry6.git"
 
@@ -292,8 +292,8 @@ do
         runremote ls -al $TEST_BASE/bar/u1/try6.git/git-daemon-export-ok
         expect "ls: cannot access $TEST_BASE/bar/u1/try6.git/git-daemon-export-ok: No such file or directory"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 60 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 72 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 60 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 72 .* projects.list"
         runremote cat projects.list
         notexpect "bar%2Fu1%2Ftry6.git"
 
@@ -303,10 +303,10 @@ do
         runlocal git ls-remote u1:bar/u1/try7
         runremote ls -al $TEST_BASE/bar/u1/try7.git/git-daemon-export-ok
         [ "$ais" = "0" ] && expect "ls: cannot access $TEST_BASE/bar/u1/try7.git/git-daemon-export-ok: No such file or directory"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test .* $TEST_BASE/bar/u1/try7.git/git-daemon-export-ok"
+        [ "$ais" = "1" ] && expect "$USER $USER .* $TEST_BASE/bar/u1/try7.git/git-daemon-export-ok"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 60 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 92 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 60 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 92 .* projects.list"
         runremote cat projects.list
         notexpect "bar/u1/try7.git"
         notexpect "bar/u1/try7.git"
@@ -318,10 +318,10 @@ do
 
         runlocal git ls-remote u1:bar/u1/try8
         runremote ls -al $TEST_BASE/bar/u1/try8.git/git-daemon-export-ok
-        expect "gitolite-test gitolite-test .* $TEST_BASE/bar/u1/try8.git/git-daemon-export-ok"
+        expect "$USER $USER .* $TEST_BASE/bar/u1/try8.git/git-daemon-export-ok"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 60 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 92 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 60 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 92 .* projects.list"
         runremote cat projects.list
         notexpect "bar%2Fu1%2Ftry8.git"
 
@@ -332,8 +332,8 @@ do
         runremote ls -al $TEST_BASE/bar/u1/try9.git/git-daemon-export-ok
         expect "ls: cannot access $TEST_BASE/bar/u1/try9.git/git-daemon-export-ok: No such file or directory"
         runremote ls -al projects.list
-        [ "$ais" = "0" ] && expect "gitolite-test gitolite-test 80 .* projects.list"
-        [ "$ais" = "1" ] && expect "gitolite-test gitolite-test 112 .* projects.list"
+        [ "$ais" = "0" ] && expect "$USER $USER 80 .* projects.list"
+        [ "$ais" = "1" ] && expect "$USER $USER 112 .* projects.list"
         runremote cat projects.list
         expect "bar%2Fu1%2Ftry9.git"
 
diff --git a/t/t64-write-able b/t/t64-write-able
index 10ec1fa..252af10 100644
--- a/t/t64-write-able
+++ b/t/t64-write-able
@@ -59,9 +59,9 @@ do
     expect "disabling following locations with message:"
     expect "first line"
     expect "^second line"
-    expect "/home/gitolite-test"
+    expect "/home/$USER"
     runremote ls -al .gitolite.down
-    expect "^.rw------- 1 gitolite-test gitolite-test .. ... .. ..:.. .gitolite.down"
+    expect "^.rw------- 1 $USER $USER .. ... .. ..:.. .gitolite.down"
 
     name "u1 push foo fail"
     cd ~/td/foo
@@ -85,7 +85,7 @@ do
     runlocal ssh gitolite able en
     expect "give me '@all' or some reponame"
     runlocal ssh gitolite able en @all
-    expect "removed ./home/gitolite-test/.gitolite.down."
+    expect "removed ./home/$USER/.gitolite.down."
     runremote ls -al .gitolite.down
     expect "ls: cannot access .gitolite.down: No such file or directory"
 
@@ -109,7 +109,7 @@ do
     expect "foo down"
     expect "$TEST_BASE/foo.git"
     runremote ls -al $TEST_BASE/foo.git/.gitolite.down
-    expect ".rw------- 1 gitolite-test gitolite-test .* ..:.. $TEST_BASE/foo.git/.gitolite.down"
+    expect ".rw------- 1 $USER $USER .* ..:.. $TEST_BASE/foo.git/.gitolite.down"
 
     name "u1 push foo fail"
     cd ~/td/foo
@@ -137,7 +137,7 @@ do
     expect "bar/u2/r1 down"
     expect "$TEST_BASE/bar/u2/r1.git"
     runremote ls -al $TEST_BASE/bar/u2/r1.git/.gitolite.down
-    expect ".rw------- 1 gitolite-test gitolite-test .. ... .. ..:.. $TEST_BASE/bar/u2/r1.git/.gitolite.down"
+    expect ".rw------- 1 $USER $USER .. ... .. ..:.. $TEST_BASE/bar/u2/r1.git/.gitolite.down"
 
     name "u1 push foo"
     cd ~/td/foo
diff --git a/t/t67-hub b/t/t67-hub
index 822df71..9f1135e 100644
--- a/t/t67-hub
+++ b/t/t67-hub
@@ -57,7 +57,7 @@ do
     cd ~/td
     runlocal ssh u2 fork r1 child/u2/myr1
     runremote ls -al $TEST_BASE/child/u2/myr1.git/gl-forked-from
-    expect "gitolite-test gitolite-test 3 .* $TEST_BASE/child/u2/myr1.git/gl-forked-from"
+    expect "$USER $USER 3 .* $TEST_BASE/child/u2/myr1.git/gl-forked-from"
     runremote cat $TEST_BASE/child/u2/myr1.git/gl-forked-from
     expect r1
     runlocal git clone u2:child/u2/myr1