diff --git a/t/Makefile b/t/Makefile
index a41907ee53..226b554ad9 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -14,6 +14,7 @@ PERL = /usr/bin/perl
 TEST_FILES = database_dependent.pl
 PROVE = /usr/bin/prove
 PROVE_FLAGS = -v
+PERL5LIB = ..
 KOHA_CONF_DIR = ../etc
 CONF_FILE_TEMPLATE = $(KOHA_CONF_DIR)/koha-conf.xml 
 TEST_CONF_FILE = run/etc/koha-conf.xml
@@ -56,7 +57,7 @@ $(SCRIPTS) ::
 	$(CHMOD) 755 $(TEST_SCRIPT_DIR)/$@
 
 test :: config_file $(ZEBRA_CONF_FILES) $(SCRIPTS)
-	KOHA_CONF=$(TEST_CONF_FILE) $(PROVE) $(PROVE_FLAGS) $(TEST_FILES)
+	KOHA_CONF=$(TEST_CONF_FILE) PERL5LIB=$(PERL5LIB) $(PROVE) $(PROVE_FLAGS) $(TEST_FILES)
 
 test_run_dirs ::
 	$(MKPATH) run/etc
diff --git a/t/database_dependent.pl b/t/database_dependent.pl
index 3afd422355..6844a6d77b 100644
--- a/t/database_dependent.pl
+++ b/t/database_dependent.pl
@@ -15,8 +15,6 @@ use C4::Languages;
 use Data::Dumper;
 use Test::More;
 
-use lib q( . .. );
-
 use Test::Class::Load qw ( . ); # run from the t directory
 
 create_test_database();
diff --git a/t/lib/KohaTest.pm b/t/lib/KohaTest.pm
index da57f47b02..92863067cc 100644
--- a/t/lib/KohaTest.pm
+++ b/t/lib/KohaTest.pm
@@ -8,7 +8,6 @@ eval "use Test::Class";
 plan skip_all => "Test::Class required for performing database tests" if $@;
 # Or, maybe I should just die there.
 
-use lib qw(..);
 use C4::Biblio;
 use C4::Bookfund;
 use C4::Bookseller;