diff --git a/t/Acquisition.t b/t/db_dependent/Acquisition.t
similarity index 100%
rename from t/Acquisition.t
rename to t/db_dependent/Acquisition.t
diff --git a/t/Auth.t b/t/db_dependent/Auth.t
similarity index 93%
rename from t/Auth.t
rename to t/db_dependent/Auth.t
index 1cacb3195d..dcfea53329 100755
--- a/t/Auth.t
+++ b/t/db_dependent/Auth.t
@@ -9,6 +9,9 @@ use warnings;
 use Test::More tests => 6;
 
 BEGIN {
+	use FindBin;
+	use lib $FindBin::Bin;
+	use override_context_prefs;
         use_ok('C4::Auth', qw(checkpw));
         use_ok('C4::Context');
 }
diff --git a/t/Auth_with_ldap.t b/t/db_dependent/Auth_with_ldap.t
similarity index 100%
rename from t/Auth_with_ldap.t
rename to t/db_dependent/Auth_with_ldap.t
diff --git a/t/Context.t b/t/db_dependent/Context.t
similarity index 100%
rename from t/Context.t
rename to t/db_dependent/Context.t
diff --git a/t/LDAP/example3.ldif b/t/db_dependent/LDAP/example3.ldif
similarity index 100%
rename from t/LDAP/example3.ldif
rename to t/db_dependent/LDAP/example3.ldif
diff --git a/t/LDAP/test_ldap_add.pl b/t/db_dependent/LDAP/test_ldap_add.pl
similarity index 100%
rename from t/LDAP/test_ldap_add.pl
rename to t/db_dependent/LDAP/test_ldap_add.pl
diff --git a/t/VirtualShelves.t b/t/db_dependent/VirtualShelves.t
similarity index 100%
rename from t/VirtualShelves.t
rename to t/db_dependent/VirtualShelves.t