diff --git a/doc/mkdoc b/doc/mkdoc
index 863eebe..9cb3ced 100755
--- a/doc/mkdoc
+++ b/doc/mkdoc
@@ -7,7 +7,7 @@ my $MKD = "./Markdown.pl";
 use 5.10.0;
 use strict;
 use warnings;
-use lib '../src/Gitolite/Test';
+use lib '../src/lib/Gitolite/Test';
 use Tsh;
 
 $ENV{TSH_ERREXIT} = 1;
diff --git a/install b/install
index f9df125..1cf7853 100755
--- a/install
+++ b/install
@@ -10,7 +10,8 @@ use FindBin;
 
 # meant to be run from the root of the gitolite tree, one level above 'src'
 BEGIN { $ENV{GL_BINDIR} = $FindBin::RealBin . "/src"; }
-use lib $ENV{GL_BINDIR};
+BEGIN { $ENV{GL_LIBDIR} = "$ENV{GL_BINDIR}/lib"; }
+use lib $ENV{GL_LIBDIR};
 use Gitolite::Common;
 
 =for usage
diff --git a/src/commands/access b/src/commands/access
index 726a346..db3ece0 100755
--- a/src/commands/access
+++ b/src/commands/access
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-use lib $ENV{GL_BINDIR};
+use lib $ENV{GL_LIBDIR};
 use Gitolite::Rc;
 use Gitolite::Common;
 use Gitolite::Conf::Load;
diff --git a/src/commands/creator b/src/commands/creator
index 94b8cf9..702df73 100755
--- a/src/commands/creator
+++ b/src/commands/creator
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-use lib $ENV{GL_BINDIR};
+use lib $ENV{GL_LIBDIR};
 use Gitolite::Rc;
 use Gitolite::Common;
 use Gitolite::Conf::Load;
diff --git a/src/commands/git-config b/src/commands/git-config
index 2cb8948..293f298 100755
--- a/src/commands/git-config
+++ b/src/commands/git-config
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 use Getopt::Long;
-use lib $ENV{GL_BINDIR};
+use lib $ENV{GL_LIBDIR};
 use Gitolite::Rc;
 use Gitolite::Common;
 use Gitolite::Conf::Load;
diff --git a/src/commands/help b/src/commands/help
index f954f8e..15539fa 100755
--- a/src/commands/help
+++ b/src/commands/help
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-use lib $ENV{GL_BINDIR};
+use lib $ENV{GL_LIBDIR};
 use Gitolite::Rc;
 use Gitolite::Common;
 
diff --git a/src/commands/info b/src/commands/info
index f68f867..4eca761 100755
--- a/src/commands/info
+++ b/src/commands/info
@@ -4,7 +4,7 @@ use warnings;
 
 use Getopt::Long;
 
-use lib $ENV{GL_BINDIR};
+use lib $ENV{GL_LIBDIR};
 use Gitolite::Rc;
 use Gitolite::Common;
 use Gitolite::Conf::Load;
diff --git a/src/commands/mirror b/src/commands/mirror
index 004ee38..be0d401 100755
--- a/src/commands/mirror
+++ b/src/commands/mirror
@@ -8,7 +8,7 @@ BEGIN {
     delete $ENV{GL_TID};
 }
 
-use lib $ENV{GL_BINDIR};
+use lib $ENV{GL_LIBDIR};
 use Gitolite::Rc;
 use Gitolite::Common;
 use Gitolite::Conf::Load;
diff --git a/src/commands/perms b/src/commands/perms
index bbc0e5f..dce271c 100755
--- a/src/commands/perms
+++ b/src/commands/perms
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-use lib $ENV{GL_BINDIR};
+use lib $ENV{GL_LIBDIR};
 use Gitolite::Rc;
 use Gitolite::Common;
 use Gitolite::Conf::Load;
diff --git a/src/commands/print-default-rc b/src/commands/print-default-rc
index d877462..79b88c1 100755
--- a/src/commands/print-default-rc
+++ b/src/commands/print-default-rc
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-use lib $ENV{GL_BINDIR};
+use lib $ENV{GL_LIBDIR};
 use Gitolite::Rc;
 
 print glrc('default-text');
diff --git a/src/commands/writable b/src/commands/writable
index 2b46fa2..fdaa540 100755
--- a/src/commands/writable
+++ b/src/commands/writable
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-use lib $ENV{GL_BINDIR};
+use lib $ENV{GL_LIBDIR};
 use Gitolite::Easy;
 
 =for usage
diff --git a/src/gitolite b/src/gitolite
index b96c2ee..911eee9 100755
--- a/src/gitolite
+++ b/src/gitolite
@@ -36,7 +36,8 @@ written.
 use FindBin;
 
 BEGIN { $ENV{GL_BINDIR} = $FindBin::RealBin; }
-use lib $ENV{GL_BINDIR};
+BEGIN { $ENV{GL_LIBDIR} = "$ENV{GL_BINDIR}/lib"; }
+use lib $ENV{GL_LIBDIR};
 use Gitolite::Rc;
 use Gitolite::Common;
 
diff --git a/src/gitolite-shell b/src/gitolite-shell
index 442ae9e..f3cec61 100755
--- a/src/gitolite-shell
+++ b/src/gitolite-shell
@@ -6,7 +6,8 @@
 use FindBin;
 
 BEGIN { $ENV{GL_BINDIR} = $FindBin::RealBin; }
-use lib $ENV{GL_BINDIR};
+BEGIN { $ENV{GL_LIBDIR} = "$ENV{GL_BINDIR}/lib"; }
+use lib $ENV{GL_LIBDIR};
 use Gitolite::Rc;
 use Gitolite::Common;
 use Gitolite::Conf::Load;
diff --git a/src/Gitolite/Common.pm b/src/lib/Gitolite/Common.pm
similarity index 100%
rename from src/Gitolite/Common.pm
rename to src/lib/Gitolite/Common.pm
diff --git a/src/Gitolite/Conf.pm b/src/lib/Gitolite/Conf.pm
similarity index 100%
rename from src/Gitolite/Conf.pm
rename to src/lib/Gitolite/Conf.pm
diff --git a/src/Gitolite/Conf/Explode.pm b/src/lib/Gitolite/Conf/Explode.pm
similarity index 100%
rename from src/Gitolite/Conf/Explode.pm
rename to src/lib/Gitolite/Conf/Explode.pm
diff --git a/src/Gitolite/Conf/Load.pm b/src/lib/Gitolite/Conf/Load.pm
similarity index 100%
rename from src/Gitolite/Conf/Load.pm
rename to src/lib/Gitolite/Conf/Load.pm
diff --git a/src/Gitolite/Conf/Store.pm b/src/lib/Gitolite/Conf/Store.pm
similarity index 100%
rename from src/Gitolite/Conf/Store.pm
rename to src/lib/Gitolite/Conf/Store.pm
diff --git a/src/Gitolite/Conf/Sugar.pm b/src/lib/Gitolite/Conf/Sugar.pm
similarity index 100%
rename from src/Gitolite/Conf/Sugar.pm
rename to src/lib/Gitolite/Conf/Sugar.pm
diff --git a/src/Gitolite/Easy.pm b/src/lib/Gitolite/Easy.pm
similarity index 100%
rename from src/Gitolite/Easy.pm
rename to src/lib/Gitolite/Easy.pm
diff --git a/src/Gitolite/Hooks/PostUpdate.pm b/src/lib/Gitolite/Hooks/PostUpdate.pm
similarity index 93%
rename from src/Gitolite/Hooks/PostUpdate.pm
rename to src/lib/Gitolite/Hooks/PostUpdate.pm
index 6effeda..70e23f8 100644
--- a/src/Gitolite/Hooks/PostUpdate.pm
+++ b/src/lib/Gitolite/Hooks/PostUpdate.pm
@@ -55,10 +55,7 @@ __DATA__
 use strict;
 use warnings;
 
-BEGIN {
-    die "GL_BINDIR not set; aborting\n" unless $ENV{GL_BINDIR};
-}
-use lib $ENV{GL_BINDIR};
+use lib $ENV{GL_LIBDIR};
 use Gitolite::Hooks::PostUpdate;
 
 # gitolite post-update hook (only for the admin repo)
diff --git a/src/Gitolite/Hooks/Update.pm b/src/lib/Gitolite/Hooks/Update.pm
similarity index 99%
rename from src/Gitolite/Hooks/Update.pm
rename to src/lib/Gitolite/Hooks/Update.pm
index 7cb17b1..1fd5530 100644
--- a/src/Gitolite/Hooks/Update.pm
+++ b/src/lib/Gitolite/Hooks/Update.pm
@@ -152,7 +152,7 @@ __DATA__
 use strict;
 use warnings;
 
-use lib $ENV{GL_BINDIR};
+use lib $ENV{GL_LIBDIR};
 use Gitolite::Hooks::Update;
 
 # gitolite update hook
diff --git a/src/Gitolite/Rc.pm b/src/lib/Gitolite/Rc.pm
similarity index 98%
rename from src/Gitolite/Rc.pm
rename to src/lib/Gitolite/Rc.pm
index 96d638f..2637836 100644
--- a/src/Gitolite/Rc.pm
+++ b/src/lib/Gitolite/Rc.pm
@@ -29,12 +29,14 @@ our %rc;
 
 # ----------------------------------------------------------------------
 
-# variables that could be overridden by the rc file
+# pre-populate some important rc keys
 # ----------------------------------------------------------------------
 
 $rc{GL_BINDIR}    = $ENV{GL_BINDIR};
-$rc{GL_REPO_BASE} = "$ENV{HOME}/repositories";
+$rc{GL_LIBDIR}    = $ENV{GL_LIBDIR};
 
+# these keys could be overridden by the rc file later
+$rc{GL_REPO_BASE} = "$ENV{HOME}/repositories";
 $rc{GL_ADMIN_BASE} = "$ENV{HOME}/.gitolite";
 $rc{LOG_TEMPLATE}  = "$ENV{HOME}/.gitolite/logs/gitolite-%y-%m.log";
 
diff --git a/src/Gitolite/Setup.pm b/src/lib/Gitolite/Setup.pm
similarity index 100%
rename from src/Gitolite/Setup.pm
rename to src/lib/Gitolite/Setup.pm
diff --git a/src/Gitolite/Test.pm b/src/lib/Gitolite/Test.pm
similarity index 100%
rename from src/Gitolite/Test.pm
rename to src/lib/Gitolite/Test.pm
diff --git a/src/Gitolite/Test/Tsh.pm b/src/lib/Gitolite/Test/Tsh.pm
similarity index 100%
rename from src/Gitolite/Test/Tsh.pm
rename to src/lib/Gitolite/Test/Tsh.pm
diff --git a/src/Gitolite/Triggers.pm b/src/lib/Gitolite/Triggers.pm
similarity index 100%
rename from src/Gitolite/Triggers.pm
rename to src/lib/Gitolite/Triggers.pm
diff --git a/src/Gitolite/Triggers/CpuTime.pm b/src/lib/Gitolite/Triggers/CpuTime.pm
similarity index 100%
rename from src/Gitolite/Triggers/CpuTime.pm
rename to src/lib/Gitolite/Triggers/CpuTime.pm
diff --git a/src/Gitolite/Triggers/Mirroring.pm b/src/lib/Gitolite/Triggers/Mirroring.pm
similarity index 100%
rename from src/Gitolite/Triggers/Mirroring.pm
rename to src/lib/Gitolite/Triggers/Mirroring.pm
diff --git a/src/Gitolite/Triggers/Shell.pm b/src/lib/Gitolite/Triggers/Shell.pm
similarity index 100%
rename from src/Gitolite/Triggers/Shell.pm
rename to src/lib/Gitolite/Triggers/Shell.pm
diff --git a/src/Gitolite/Triggers/Writable.pm b/src/lib/Gitolite/Triggers/Writable.pm
similarity index 100%
rename from src/Gitolite/Triggers/Writable.pm
rename to src/lib/Gitolite/Triggers/Writable.pm
diff --git a/src/triggers/post-compile/ssh-authkeys b/src/triggers/post-compile/ssh-authkeys
index 5dc395e..585ea35 100755
--- a/src/triggers/post-compile/ssh-authkeys
+++ b/src/triggers/post-compile/ssh-authkeys
@@ -4,7 +4,7 @@ use warnings;
 
 use File::Temp qw(tempfile);
 
-use lib $ENV{GL_BINDIR};
+use lib $ENV{GL_LIBDIR};
 use Gitolite::Rc;
 use Gitolite::Common;
 
diff --git a/src/triggers/post-compile/update-git-configs b/src/triggers/post-compile/update-git-configs
index 79f9ad8..446b28a 100755
--- a/src/triggers/post-compile/update-git-configs
+++ b/src/triggers/post-compile/update-git-configs
@@ -5,7 +5,7 @@
 
 use FindBin;
 
-use lib $ENV{GL_BINDIR};
+use lib $ENV{GL_LIBDIR};
 use Gitolite::Rc;
 use Gitolite::Common;
 use Gitolite::Conf::Load;
diff --git a/t/0-me-first.t b/t/0-me-first.t
index f131a51..a11dfd0 100755
--- a/t/0-me-first.t
+++ b/t/0-me-first.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # initial smoke tests
diff --git a/t/access.t b/t/access.t
index 047193a..208e96a 100755
--- a/t/access.t
+++ b/t/access.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # test 'gitolite access'
diff --git a/t/all-yall.t b/t/all-yall.t
index 5691cf2..901b1c2 100755
--- a/t/all-yall.t
+++ b/t/all-yall.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # could anything be clearer than "all y'all"?
diff --git a/t/basic.t b/t/basic.t
index 37f9b12..3e8c3aa 100755
--- a/t/basic.t
+++ b/t/basic.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # some more basic tests
diff --git a/t/branch-perms.t b/t/branch-perms.t
index 4e4c5ff..64b2fcb 100755
--- a/t/branch-perms.t
+++ b/t/branch-perms.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # branch permissions test
diff --git a/t/daemon-gitweb-via-perms.t b/t/daemon-gitweb-via-perms.t
index 33b8e90..0d19371 100755
--- a/t/daemon-gitweb-via-perms.t
+++ b/t/daemon-gitweb-via-perms.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # basic tests
diff --git a/t/deleg-1.t b/t/deleg-1.t
index 5f4d6e5..933a17f 100755
--- a/t/deleg-1.t
+++ b/t/deleg-1.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # delegation tests -- part 1
diff --git a/t/deleg-2.t b/t/deleg-2.t
index cf55972..ccf9cc5 100755
--- a/t/deleg-2.t
+++ b/t/deleg-2.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # delegation tests -- part 2
diff --git a/t/deny-create.t b/t/deny-create.t
index 67451ea..a4b7e4f 100755
--- a/t/deny-create.t
+++ b/t/deny-create.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # deny-create, the RW.*C flag
diff --git a/t/deny-rules-2.t b/t/deny-rules-2.t
index d59f144..0ca15fe 100755
--- a/t/deny-rules-2.t
+++ b/t/deny-rules-2.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # more on deny-rules
diff --git a/t/deny-rules.t b/t/deny-rules.t
index 9726ac7..c0e7cbb 100755
--- a/t/deny-rules.t
+++ b/t/deny-rules.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # deny rules
diff --git a/t/easy.t b/t/easy.t
index 9e4bfb4..c626602 100755
--- a/t/easy.t
+++ b/t/easy.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Easy;
 use Gitolite::Test;
 # put this after ::Easy because it chdirs away from where you were and the
diff --git a/t/git-config.t b/t/git-config.t
index 83ad7f4..437e1cc 100755
--- a/t/git-config.t
+++ b/t/git-config.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # git config settings
diff --git a/t/hostname.t b/t/hostname.t
index a6cbde2..dfb8885 100755
--- a/t/hostname.t
+++ b/t/hostname.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # %HOSTNAME tests
diff --git a/t/include-subconf.t b/t/include-subconf.t
index a3d2a57..6bdff81 100755
--- a/t/include-subconf.t
+++ b/t/include-subconf.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # include and subconf
diff --git a/t/info.t b/t/info.t
index ce54027..deaacb8 100755
--- a/t/info.t
+++ b/t/info.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # the info command
diff --git a/t/invalid-refnames-filenames.t b/t/invalid-refnames-filenames.t
index 7cd50a2..d3a3065 100755
--- a/t/invalid-refnames-filenames.t
+++ b/t/invalid-refnames-filenames.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # invalid refnames
diff --git a/t/listers.t b/t/listers.t
index b824dd8..1f7c7eb 100755
--- a/t/listers.t
+++ b/t/listers.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # the various list-* commands
diff --git a/t/merge-check.t b/t/merge-check.t
index 33a5356..b2642ed 100755
--- a/t/merge-check.t
+++ b/t/merge-check.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # merge check -- the M flag
diff --git a/t/mirror-test b/t/mirror-test
index 8793083..6f605b9 100755
--- a/t/mirror-test
+++ b/t/mirror-test
@@ -10,7 +10,7 @@ use warnings;
 $ENV{TSH_ERREXIT} = 1;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 use Cwd;
 my $workdir = getcwd();
diff --git a/t/partial-copy.t b/t/partial-copy.t
index 20a2cfe..6b8dfdc 100755
--- a/t/partial-copy.t
+++ b/t/partial-copy.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # test script for partial copy feature
diff --git a/t/perm-roles.t b/t/perm-roles.t
index 6264644..a1c4f85 100755
--- a/t/perm-roles.t
+++ b/t/perm-roles.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # permissions using role names
diff --git a/t/perms-groups.t b/t/perms-groups.t
index 59c5fb5..a4b6839 100755
--- a/t/perms-groups.t
+++ b/t/perms-groups.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # assigning roles to groups instead of users
diff --git a/t/personal-branches.t b/t/personal-branches.t
index 4c53537..8a08128 100755
--- a/t/personal-branches.t
+++ b/t/personal-branches.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # personal branches
diff --git a/t/reset b/t/reset
index 7805940..502de2b 100755
--- a/t/reset
+++ b/t/reset
@@ -7,7 +7,7 @@ BEGIN {
 }
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 use Cwd;
diff --git a/t/rule-seq.t b/t/rule-seq.t
index b7e3386..0d97558 100755
--- a/t/rule-seq.t
+++ b/t/rule-seq.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # rule sequence
diff --git a/t/sequence.t b/t/sequence.t
index d85f420..ef11689 100755
--- a/t/sequence.t
+++ b/t/sequence.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # uhh, seems to be another rule sequence test
diff --git a/t/ssh-authkeys.t b/t/ssh-authkeys.t
index d941922..9a897ca 100755
--- a/t/ssh-authkeys.t
+++ b/t/ssh-authkeys.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # testing the (separate) authkeys handler
diff --git a/t/ssh-basic.t b/t/ssh-basic.t
index 2ace6ca..ebed2d2 100755
--- a/t/ssh-basic.t
+++ b/t/ssh-basic.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Common;
 use Gitolite::Test;
 
diff --git a/t/vrefs-1.t b/t/vrefs-1.t
index d7ecaa4..bd5086b 100755
--- a/t/vrefs-1.t
+++ b/t/vrefs-1.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # VREFs - part 1
diff --git a/t/vrefs-2.t b/t/vrefs-2.t
index eb9d43a..6c53341 100755
--- a/t/vrefs-2.t
+++ b/t/vrefs-2.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # VREFs - part 2
diff --git a/t/wild-1.t b/t/wild-1.t
index 2824e37..c957798 100755
--- a/t/wild-1.t
+++ b/t/wild-1.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # wild repos - part 1
diff --git a/t/wild-2.t b/t/wild-2.t
index 0e49538..7f5d338 100755
--- a/t/wild-2.t
+++ b/t/wild-2.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 # wild repos - part 2
diff --git a/t/writable.t b/t/writable.t
index 25d93ec..e778414 100755
--- a/t/writable.t
+++ b/t/writable.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 use Cwd;
 my $workdir = getcwd();
diff --git a/t/z-end.t b/t/z-end.t
index 25edbd9..6c98fe4 100755
--- a/t/z-end.t
+++ b/t/z-end.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 # this is hardcoded; change it if needed
-use lib "src";
+use lib "src/lib";
 use Gitolite::Test;
 
 try "plan 1; cd $ENV{PWD}; git status -s -uno; !/./ or die" or die "dirty tree";