diff --git a/t/basic.t b/t/basic.t
index 0b8017a..37f9b12 100755
--- a/t/basic.t
+++ b/t/basic.t
@@ -45,7 +45,7 @@ try "
                                         /DENIED by fallthru/
                                         /fatal: The remote end hung up unexpectedly/
     PUSH admin;                 ok;     /master -> master/
-    tsh empty;                  ok;
+    empty;                      ok;
     PUSH admin master:mm
                                 !ok;    gsh
                                         /DENIED by refs/heads/mm/
diff --git a/t/ssh-authkeys.t b/t/ssh-authkeys.t
index fa11a6c..98f2d79 100755
--- a/t/ssh-authkeys.t
+++ b/t/ssh-authkeys.t
@@ -12,6 +12,7 @@ use Gitolite::Test;
 $ENV{GL_BINDIR} = "$ENV{PWD}/src";
 
 my $ak = "$ENV{HOME}/.ssh/authorized_keys";
+mkdir("$ENV{HOME}/.ssh", 0700) if not -d "$ENV{HOME}/.ssh";
 my $kd = `gitolite query-rc -n GL_ADMIN_BASE` . "/keydir";
 
 try "plan 49";
diff --git a/t/ssh-basic.t b/t/ssh-basic.t
index 6d8a10a..14a1cf4 100755
--- a/t/ssh-basic.t
+++ b/t/ssh-basic.t
@@ -24,6 +24,9 @@ try "
     cp $bd/../t/keys/u[1-6]* $h/.ssh;       ok or die 2
     cp $bd/../t/keys/admin*  $h/.ssh;       ok or die 3
     cp $bd/../t/keys/config  $h/.ssh;       ok or die 4
+        cat $h/.ssh/config
+        perl s/%USER/$ENV{USER}/
+        put $h/.ssh/config
 
     mkdir                  $ab/keydir;      ok or die 5
     cp $bd/../t/keys/*.pub $ab/keydir;      ok or die 6