diff --git a/t/database_dependent.pl b/t/db_dependent/database_dependent.pl
similarity index 88%
rename from t/database_dependent.pl
rename to t/db_dependent/database_dependent.pl
index 1b52be7933..de05224bba 100644
--- a/t/database_dependent.pl
+++ b/t/db_dependent/database_dependent.pl
@@ -13,7 +13,7 @@ use C4::Context;
 use Data::Dumper;
 use Test::More;
 
-use Test::Class::Load qw ( . ); # run from the t directory
+use Test::Class::Load qw ( . ); # run from the t/db_dependent directory
 
 KohaTest::clear_test_database();
 KohaTest::create_test_database();
diff --git a/t/lib/KohaTest.pm b/t/db_dependent/lib/KohaTest.pm
similarity index 100%
rename from t/lib/KohaTest.pm
rename to t/db_dependent/lib/KohaTest.pm
diff --git a/t/lib/KohaTest/Accounts.pm b/t/db_dependent/lib/KohaTest/Accounts.pm
similarity index 100%
rename from t/lib/KohaTest/Accounts.pm
rename to t/db_dependent/lib/KohaTest/Accounts.pm
diff --git a/t/lib/KohaTest/Acquisition.pm b/t/db_dependent/lib/KohaTest/Acquisition.pm
similarity index 100%
rename from t/lib/KohaTest/Acquisition.pm
rename to t/db_dependent/lib/KohaTest/Acquisition.pm
diff --git a/t/lib/KohaTest/Acquisition/GetHistory.pm b/t/db_dependent/lib/KohaTest/Acquisition/GetHistory.pm
similarity index 100%
rename from t/lib/KohaTest/Acquisition/GetHistory.pm
rename to t/db_dependent/lib/KohaTest/Acquisition/GetHistory.pm
diff --git a/t/lib/KohaTest/Acquisition/GetLateOrders.pm b/t/db_dependent/lib/KohaTest/Acquisition/GetLateOrders.pm
similarity index 100%
rename from t/lib/KohaTest/Acquisition/GetLateOrders.pm
rename to t/db_dependent/lib/KohaTest/Acquisition/GetLateOrders.pm
diff --git a/t/lib/KohaTest/Acquisition/GetParcel.pm b/t/db_dependent/lib/KohaTest/Acquisition/GetParcel.pm
similarity index 100%
rename from t/lib/KohaTest/Acquisition/GetParcel.pm
rename to t/db_dependent/lib/KohaTest/Acquisition/GetParcel.pm
diff --git a/t/lib/KohaTest/Acquisition/GetParcels.pm b/t/db_dependent/lib/KohaTest/Acquisition/GetParcels.pm
similarity index 100%
rename from t/lib/KohaTest/Acquisition/GetParcels.pm
rename to t/db_dependent/lib/KohaTest/Acquisition/GetParcels.pm
diff --git a/t/lib/KohaTest/Acquisition/GetPendingOrders.pm b/t/db_dependent/lib/KohaTest/Acquisition/GetPendingOrders.pm
similarity index 100%
rename from t/lib/KohaTest/Acquisition/GetPendingOrders.pm
rename to t/db_dependent/lib/KohaTest/Acquisition/GetPendingOrders.pm
diff --git a/t/lib/KohaTest/Acquisition/NewOrder.pm b/t/db_dependent/lib/KohaTest/Acquisition/NewOrder.pm
similarity index 100%
rename from t/lib/KohaTest/Acquisition/NewOrder.pm
rename to t/db_dependent/lib/KohaTest/Acquisition/NewOrder.pm
diff --git a/t/lib/KohaTest/AuthoritiesMarc.pm b/t/db_dependent/lib/KohaTest/AuthoritiesMarc.pm
similarity index 100%
rename from t/lib/KohaTest/AuthoritiesMarc.pm
rename to t/db_dependent/lib/KohaTest/AuthoritiesMarc.pm
diff --git a/t/lib/KohaTest/Biblio.pm b/t/db_dependent/lib/KohaTest/Biblio.pm
similarity index 100%
rename from t/lib/KohaTest/Biblio.pm
rename to t/db_dependent/lib/KohaTest/Biblio.pm
diff --git a/t/lib/KohaTest/Biblio/GetNoZebraIndexes.pm b/t/db_dependent/lib/KohaTest/Biblio/GetNoZebraIndexes.pm
similarity index 100%
rename from t/lib/KohaTest/Biblio/GetNoZebraIndexes.pm
rename to t/db_dependent/lib/KohaTest/Biblio/GetNoZebraIndexes.pm
diff --git a/t/lib/KohaTest/Biblio/ModBiblio.pm b/t/db_dependent/lib/KohaTest/Biblio/ModBiblio.pm
similarity index 100%
rename from t/lib/KohaTest/Biblio/ModBiblio.pm
rename to t/db_dependent/lib/KohaTest/Biblio/ModBiblio.pm
diff --git a/t/lib/KohaTest/Biblio/get_biblio_authorised_values.pm b/t/db_dependent/lib/KohaTest/Biblio/get_biblio_authorised_values.pm
similarity index 100%
rename from t/lib/KohaTest/Biblio/get_biblio_authorised_values.pm
rename to t/db_dependent/lib/KohaTest/Biblio/get_biblio_authorised_values.pm
diff --git a/t/lib/KohaTest/Branch.pm b/t/db_dependent/lib/KohaTest/Branch.pm
similarity index 100%
rename from t/lib/KohaTest/Branch.pm
rename to t/db_dependent/lib/KohaTest/Branch.pm
diff --git a/t/lib/KohaTest/Branch/GetBranches.pm b/t/db_dependent/lib/KohaTest/Branch/GetBranches.pm
similarity index 100%
rename from t/lib/KohaTest/Branch/GetBranches.pm
rename to t/db_dependent/lib/KohaTest/Branch/GetBranches.pm
diff --git a/t/lib/KohaTest/Breeding.pm b/t/db_dependent/lib/KohaTest/Breeding.pm
similarity index 100%
rename from t/lib/KohaTest/Breeding.pm
rename to t/db_dependent/lib/KohaTest/Breeding.pm
diff --git a/t/lib/KohaTest/Calendar.pm b/t/db_dependent/lib/KohaTest/Calendar.pm
similarity index 100%
rename from t/lib/KohaTest/Calendar.pm
rename to t/db_dependent/lib/KohaTest/Calendar.pm
diff --git a/t/lib/KohaTest/Calendar/New.pm b/t/db_dependent/lib/KohaTest/Calendar/New.pm
similarity index 100%
rename from t/lib/KohaTest/Calendar/New.pm
rename to t/db_dependent/lib/KohaTest/Calendar/New.pm
diff --git a/t/lib/KohaTest/Category.pm b/t/db_dependent/lib/KohaTest/Category.pm
similarity index 100%
rename from t/lib/KohaTest/Category.pm
rename to t/db_dependent/lib/KohaTest/Category.pm
diff --git a/t/lib/KohaTest/Circulation.pm b/t/db_dependent/lib/KohaTest/Circulation.pm
similarity index 100%
rename from t/lib/KohaTest/Circulation.pm
rename to t/db_dependent/lib/KohaTest/Circulation.pm
diff --git a/t/lib/KohaTest/Circulation/AddIssue.pm b/t/db_dependent/lib/KohaTest/Circulation/AddIssue.pm
similarity index 100%
rename from t/lib/KohaTest/Circulation/AddIssue.pm
rename to t/db_dependent/lib/KohaTest/Circulation/AddIssue.pm
diff --git a/t/lib/KohaTest/Circulation/GetUpcomingDueIssues.pm b/t/db_dependent/lib/KohaTest/Circulation/GetUpcomingDueIssues.pm
similarity index 100%
rename from t/lib/KohaTest/Circulation/GetUpcomingDueIssues.pm
rename to t/db_dependent/lib/KohaTest/Circulation/GetUpcomingDueIssues.pm
diff --git a/t/lib/KohaTest/Circulation/MarkIssueReturned.pm b/t/db_dependent/lib/KohaTest/Circulation/MarkIssueReturned.pm
similarity index 100%
rename from t/lib/KohaTest/Circulation/MarkIssueReturned.pm
rename to t/db_dependent/lib/KohaTest/Circulation/MarkIssueReturned.pm
diff --git a/t/lib/KohaTest/Context.pm b/t/db_dependent/lib/KohaTest/Context.pm
similarity index 100%
rename from t/lib/KohaTest/Context.pm
rename to t/db_dependent/lib/KohaTest/Context.pm
diff --git a/t/lib/KohaTest/Context/preference.pm b/t/db_dependent/lib/KohaTest/Context/preference.pm
similarity index 100%
rename from t/lib/KohaTest/Context/preference.pm
rename to t/db_dependent/lib/KohaTest/Context/preference.pm
diff --git a/t/lib/KohaTest/Dates.pm b/t/db_dependent/lib/KohaTest/Dates.pm
similarity index 100%
rename from t/lib/KohaTest/Dates.pm
rename to t/db_dependent/lib/KohaTest/Dates.pm
diff --git a/t/lib/KohaTest/Dates/Usage.pm b/t/db_dependent/lib/KohaTest/Dates/Usage.pm
similarity index 100%
rename from t/lib/KohaTest/Dates/Usage.pm
rename to t/db_dependent/lib/KohaTest/Dates/Usage.pm
diff --git a/t/lib/KohaTest/Heading.pm b/t/db_dependent/lib/KohaTest/Heading.pm
similarity index 100%
rename from t/lib/KohaTest/Heading.pm
rename to t/db_dependent/lib/KohaTest/Heading.pm
diff --git a/t/lib/KohaTest/Heading/MARC21.pm b/t/db_dependent/lib/KohaTest/Heading/MARC21.pm
similarity index 100%
rename from t/lib/KohaTest/Heading/MARC21.pm
rename to t/db_dependent/lib/KohaTest/Heading/MARC21.pm
diff --git a/t/lib/KohaTest/ImportBatch.pm b/t/db_dependent/lib/KohaTest/ImportBatch.pm
similarity index 100%
rename from t/lib/KohaTest/ImportBatch.pm
rename to t/db_dependent/lib/KohaTest/ImportBatch.pm
diff --git a/t/lib/KohaTest/ImportBatch/AddImportBatch.pm b/t/db_dependent/lib/KohaTest/ImportBatch/AddImportBatch.pm
similarity index 100%
rename from t/lib/KohaTest/ImportBatch/AddImportBatch.pm
rename to t/db_dependent/lib/KohaTest/ImportBatch/AddImportBatch.pm
diff --git a/t/lib/KohaTest/ImportBatch/AddItemsToImportBiblio.pm b/t/db_dependent/lib/KohaTest/ImportBatch/AddItemsToImportBiblio.pm
similarity index 100%
rename from t/lib/KohaTest/ImportBatch/AddItemsToImportBiblio.pm
rename to t/db_dependent/lib/KohaTest/ImportBatch/AddItemsToImportBiblio.pm
diff --git a/t/lib/KohaTest/ImportBatch/BatchStageCommitRevert.pm b/t/db_dependent/lib/KohaTest/ImportBatch/BatchStageCommitRevert.pm
similarity index 100%
rename from t/lib/KohaTest/ImportBatch/BatchStageCommitRevert.pm
rename to t/db_dependent/lib/KohaTest/ImportBatch/BatchStageCommitRevert.pm
diff --git a/t/lib/KohaTest/ImportBatch/GetImportBatch.pm b/t/db_dependent/lib/KohaTest/ImportBatch/GetImportBatch.pm
similarity index 100%
rename from t/lib/KohaTest/ImportBatch/GetImportBatch.pm
rename to t/db_dependent/lib/KohaTest/ImportBatch/GetImportBatch.pm
diff --git a/t/lib/KohaTest/ImportBatch/GetImportRecordMarc.pm b/t/db_dependent/lib/KohaTest/ImportBatch/GetImportRecordMarc.pm
similarity index 100%
rename from t/lib/KohaTest/ImportBatch/GetImportRecordMarc.pm
rename to t/db_dependent/lib/KohaTest/ImportBatch/GetImportRecordMarc.pm
diff --git a/t/lib/KohaTest/ImportBatch/GetZ3950BatchId.pm b/t/db_dependent/lib/KohaTest/ImportBatch/GetZ3950BatchId.pm
similarity index 100%
rename from t/lib/KohaTest/ImportBatch/GetZ3950BatchId.pm
rename to t/db_dependent/lib/KohaTest/ImportBatch/GetZ3950BatchId.pm
diff --git a/t/lib/KohaTest/Installer.pm b/t/db_dependent/lib/KohaTest/Installer.pm
similarity index 100%
rename from t/lib/KohaTest/Installer.pm
rename to t/db_dependent/lib/KohaTest/Installer.pm
diff --git a/t/lib/KohaTest/Installer/SqlScripts.pm b/t/db_dependent/lib/KohaTest/Installer/SqlScripts.pm
similarity index 100%
rename from t/lib/KohaTest/Installer/SqlScripts.pm
rename to t/db_dependent/lib/KohaTest/Installer/SqlScripts.pm
diff --git a/t/lib/KohaTest/Installer/get_file_path_from_name.pm b/t/db_dependent/lib/KohaTest/Installer/get_file_path_from_name.pm
similarity index 100%
rename from t/lib/KohaTest/Installer/get_file_path_from_name.pm
rename to t/db_dependent/lib/KohaTest/Installer/get_file_path_from_name.pm
diff --git a/t/lib/KohaTest/ItemCirculationAlertPreference.pm b/t/db_dependent/lib/KohaTest/ItemCirculationAlertPreference.pm
similarity index 100%
rename from t/lib/KohaTest/ItemCirculationAlertPreference.pm
rename to t/db_dependent/lib/KohaTest/ItemCirculationAlertPreference.pm
diff --git a/t/lib/KohaTest/ItemType.pm b/t/db_dependent/lib/KohaTest/ItemType.pm
similarity index 100%
rename from t/lib/KohaTest/ItemType.pm
rename to t/db_dependent/lib/KohaTest/ItemType.pm
diff --git a/t/lib/KohaTest/Items.pm b/t/db_dependent/lib/KohaTest/Items.pm
similarity index 100%
rename from t/lib/KohaTest/Items.pm
rename to t/db_dependent/lib/KohaTest/Items.pm
diff --git a/t/lib/KohaTest/Items/ColumnFixes.pm b/t/db_dependent/lib/KohaTest/Items/ColumnFixes.pm
similarity index 100%
rename from t/lib/KohaTest/Items/ColumnFixes.pm
rename to t/db_dependent/lib/KohaTest/Items/ColumnFixes.pm
diff --git a/t/lib/KohaTest/Items/GetItemsForInventory.pm b/t/db_dependent/lib/KohaTest/Items/GetItemsForInventory.pm
similarity index 100%
rename from t/lib/KohaTest/Items/GetItemsForInventory.pm
rename to t/db_dependent/lib/KohaTest/Items/GetItemsForInventory.pm
diff --git a/t/lib/KohaTest/Items/ModItemsFromMarc.pm b/t/db_dependent/lib/KohaTest/Items/ModItemsFromMarc.pm
similarity index 100%
rename from t/lib/KohaTest/Items/ModItemsFromMarc.pm
rename to t/db_dependent/lib/KohaTest/Items/ModItemsFromMarc.pm
diff --git a/t/lib/KohaTest/Items/SetDefaults.pm b/t/db_dependent/lib/KohaTest/Items/SetDefaults.pm
similarity index 100%
rename from t/lib/KohaTest/Items/SetDefaults.pm
rename to t/db_dependent/lib/KohaTest/Items/SetDefaults.pm
diff --git a/t/lib/KohaTest/Koha.pm b/t/db_dependent/lib/KohaTest/Koha.pm
similarity index 100%
rename from t/lib/KohaTest/Koha.pm
rename to t/db_dependent/lib/KohaTest/Koha.pm
diff --git a/t/lib/KohaTest/Koha/displayServers.pm b/t/db_dependent/lib/KohaTest/Koha/displayServers.pm
similarity index 100%
rename from t/lib/KohaTest/Koha/displayServers.pm
rename to t/db_dependent/lib/KohaTest/Koha/displayServers.pm
diff --git a/t/lib/KohaTest/Koha/get_itemtypeinfos_of.pm b/t/db_dependent/lib/KohaTest/Koha/get_itemtypeinfos_of.pm
similarity index 100%
rename from t/lib/KohaTest/Koha/get_itemtypeinfos_of.pm
rename to t/db_dependent/lib/KohaTest/Koha/get_itemtypeinfos_of.pm
diff --git a/t/lib/KohaTest/Koha/getitemtypeimagedir.pm b/t/db_dependent/lib/KohaTest/Koha/getitemtypeimagedir.pm
similarity index 100%
rename from t/lib/KohaTest/Koha/getitemtypeimagedir.pm
rename to t/db_dependent/lib/KohaTest/Koha/getitemtypeimagedir.pm
diff --git a/t/lib/KohaTest/Letters.pm b/t/db_dependent/lib/KohaTest/Letters.pm
similarity index 100%
rename from t/lib/KohaTest/Letters.pm
rename to t/db_dependent/lib/KohaTest/Letters.pm
diff --git a/t/lib/KohaTest/Letters/GetLetter.pm b/t/db_dependent/lib/KohaTest/Letters/GetLetter.pm
similarity index 100%
rename from t/lib/KohaTest/Letters/GetLetter.pm
rename to t/db_dependent/lib/KohaTest/Letters/GetLetter.pm
diff --git a/t/lib/KohaTest/Letters/GetLetters.pm b/t/db_dependent/lib/KohaTest/Letters/GetLetters.pm
similarity index 100%
rename from t/lib/KohaTest/Letters/GetLetters.pm
rename to t/db_dependent/lib/KohaTest/Letters/GetLetters.pm
diff --git a/t/lib/KohaTest/Log.pm b/t/db_dependent/lib/KohaTest/Log.pm
similarity index 100%
rename from t/lib/KohaTest/Log.pm
rename to t/db_dependent/lib/KohaTest/Log.pm
diff --git a/t/lib/KohaTest/Members.pm b/t/db_dependent/lib/KohaTest/Members.pm
similarity index 100%
rename from t/lib/KohaTest/Members.pm
rename to t/db_dependent/lib/KohaTest/Members.pm
diff --git a/t/lib/KohaTest/Members/AttributeTypes.pm b/t/db_dependent/lib/KohaTest/Members/AttributeTypes.pm
similarity index 100%
rename from t/lib/KohaTest/Members/AttributeTypes.pm
rename to t/db_dependent/lib/KohaTest/Members/AttributeTypes.pm
diff --git a/t/lib/KohaTest/Members/DebarMember.pm b/t/db_dependent/lib/KohaTest/Members/DebarMember.pm
similarity index 100%
rename from t/lib/KohaTest/Members/DebarMember.pm
rename to t/db_dependent/lib/KohaTest/Members/DebarMember.pm
diff --git a/t/lib/KohaTest/Members/GetMember.pm b/t/db_dependent/lib/KohaTest/Members/GetMember.pm
similarity index 100%
rename from t/lib/KohaTest/Members/GetMember.pm
rename to t/db_dependent/lib/KohaTest/Members/GetMember.pm
diff --git a/t/lib/KohaTest/Members/GetMemberDetails.pm b/t/db_dependent/lib/KohaTest/Members/GetMemberDetails.pm
similarity index 100%
rename from t/lib/KohaTest/Members/GetMemberDetails.pm
rename to t/db_dependent/lib/KohaTest/Members/GetMemberDetails.pm
diff --git a/t/lib/KohaTest/Members/ModMember.pm b/t/db_dependent/lib/KohaTest/Members/ModMember.pm
similarity index 100%
rename from t/lib/KohaTest/Members/ModMember.pm
rename to t/db_dependent/lib/KohaTest/Members/ModMember.pm
diff --git a/t/lib/KohaTest/Message.pm b/t/db_dependent/lib/KohaTest/Message.pm
similarity index 100%
rename from t/lib/KohaTest/Message.pm
rename to t/db_dependent/lib/KohaTest/Message.pm
diff --git a/t/lib/KohaTest/NewsChannels.pm b/t/db_dependent/lib/KohaTest/NewsChannels.pm
similarity index 100%
rename from t/lib/KohaTest/NewsChannels.pm
rename to t/db_dependent/lib/KohaTest/NewsChannels.pm
diff --git a/t/lib/KohaTest/Overdues.pm b/t/db_dependent/lib/KohaTest/Overdues.pm
similarity index 100%
rename from t/lib/KohaTest/Overdues.pm
rename to t/db_dependent/lib/KohaTest/Overdues.pm
diff --git a/t/lib/KohaTest/Overdues/GetBranchcodesWithOverdueRules.pm b/t/db_dependent/lib/KohaTest/Overdues/GetBranchcodesWithOverdueRules.pm
similarity index 100%
rename from t/lib/KohaTest/Overdues/GetBranchcodesWithOverdueRules.pm
rename to t/db_dependent/lib/KohaTest/Overdues/GetBranchcodesWithOverdueRules.pm
diff --git a/t/lib/KohaTest/Overdues/GetOverdues.pm b/t/db_dependent/lib/KohaTest/Overdues/GetOverdues.pm
similarity index 100%
rename from t/lib/KohaTest/Overdues/GetOverdues.pm
rename to t/db_dependent/lib/KohaTest/Overdues/GetOverdues.pm
diff --git a/t/lib/KohaTest/Print.pm b/t/db_dependent/lib/KohaTest/Print.pm
similarity index 100%
rename from t/lib/KohaTest/Print.pm
rename to t/db_dependent/lib/KohaTest/Print.pm
diff --git a/t/lib/KohaTest/Reserves.pm b/t/db_dependent/lib/KohaTest/Reserves.pm
similarity index 100%
rename from t/lib/KohaTest/Reserves.pm
rename to t/db_dependent/lib/KohaTest/Reserves.pm
diff --git a/t/lib/KohaTest/SMS.pm b/t/db_dependent/lib/KohaTest/SMS.pm
similarity index 100%
rename from t/lib/KohaTest/SMS.pm
rename to t/db_dependent/lib/KohaTest/SMS.pm
diff --git a/t/lib/KohaTest/SMS/send_sms.pm b/t/db_dependent/lib/KohaTest/SMS/send_sms.pm
similarity index 100%
rename from t/lib/KohaTest/SMS/send_sms.pm
rename to t/db_dependent/lib/KohaTest/SMS/send_sms.pm
diff --git a/t/lib/KohaTest/Scripts.pm b/t/db_dependent/lib/KohaTest/Scripts.pm
similarity index 100%
rename from t/lib/KohaTest/Scripts.pm
rename to t/db_dependent/lib/KohaTest/Scripts.pm
diff --git a/t/lib/KohaTest/Scripts/longoverdue.pm b/t/db_dependent/lib/KohaTest/Scripts/longoverdue.pm
similarity index 100%
rename from t/lib/KohaTest/Scripts/longoverdue.pm
rename to t/db_dependent/lib/KohaTest/Scripts/longoverdue.pm
diff --git a/t/lib/KohaTest/Search.pm b/t/db_dependent/lib/KohaTest/Search.pm
similarity index 100%
rename from t/lib/KohaTest/Search.pm
rename to t/db_dependent/lib/KohaTest/Search.pm
diff --git a/t/lib/KohaTest/Search/NoZebra.pm b/t/db_dependent/lib/KohaTest/Search/NoZebra.pm
similarity index 100%
rename from t/lib/KohaTest/Search/NoZebra.pm
rename to t/db_dependent/lib/KohaTest/Search/NoZebra.pm
diff --git a/t/lib/KohaTest/Search/SimpleSearch.pm b/t/db_dependent/lib/KohaTest/Search/SimpleSearch.pm
similarity index 100%
rename from t/lib/KohaTest/Search/SimpleSearch.pm
rename to t/db_dependent/lib/KohaTest/Search/SimpleSearch.pm
diff --git a/t/lib/KohaTest/Serials.pm b/t/db_dependent/lib/KohaTest/Serials.pm
similarity index 100%
rename from t/lib/KohaTest/Serials.pm
rename to t/db_dependent/lib/KohaTest/Serials.pm
diff --git a/t/lib/KohaTest/Suggestions.pm b/t/db_dependent/lib/KohaTest/Suggestions.pm
similarity index 100%
rename from t/lib/KohaTest/Suggestions.pm
rename to t/db_dependent/lib/KohaTest/Suggestions.pm
diff --git a/t/lib/KohaTest/Z3950.pm b/t/db_dependent/lib/KohaTest/Z3950.pm
similarity index 100%
rename from t/lib/KohaTest/Z3950.pm
rename to t/db_dependent/lib/KohaTest/Z3950.pm