diff --git a/module/VuFind/tests/Auth/DatabaseTest.php b/module/VuFind/tests/unit-tests/src/Auth/DatabaseTest.php
similarity index 100%
rename from module/VuFind/tests/Auth/DatabaseTest.php
rename to module/VuFind/tests/unit-tests/src/Auth/DatabaseTest.php
diff --git a/module/VuFind/tests/Auth/ILSTest.php b/module/VuFind/tests/unit-tests/src/Auth/ILSTest.php
similarity index 100%
rename from module/VuFind/tests/Auth/ILSTest.php
rename to module/VuFind/tests/unit-tests/src/Auth/ILSTest.php
diff --git a/module/VuFind/tests/Auth/LDAPTest.php b/module/VuFind/tests/unit-tests/src/Auth/LDAPTest.php
similarity index 100%
rename from module/VuFind/tests/Auth/LDAPTest.php
rename to module/VuFind/tests/unit-tests/src/Auth/LDAPTest.php
diff --git a/module/VuFind/tests/Auth/MultiAuthTest.php b/module/VuFind/tests/unit-tests/src/Auth/MultiAuthTest.php
similarity index 100%
rename from module/VuFind/tests/Auth/MultiAuthTest.php
rename to module/VuFind/tests/unit-tests/src/Auth/MultiAuthTest.php
diff --git a/module/VuFind/tests/Auth/SIP2Test.php b/module/VuFind/tests/unit-tests/src/Auth/SIP2Test.php
similarity index 100%
rename from module/VuFind/tests/Auth/SIP2Test.php
rename to module/VuFind/tests/unit-tests/src/Auth/SIP2Test.php
diff --git a/module/VuFind/tests/Auth/ShibbolethTest.php b/module/VuFind/tests/unit-tests/src/Auth/ShibbolethTest.php
similarity index 100%
rename from module/VuFind/tests/Auth/ShibbolethTest.php
rename to module/VuFind/tests/unit-tests/src/Auth/ShibbolethTest.php
diff --git a/module/VuFind/tests/Code/ISBNTest.php b/module/VuFind/tests/unit-tests/src/Code/ISBNTest.php
similarity index 100%
rename from module/VuFind/tests/Code/ISBNTest.php
rename to module/VuFind/tests/unit-tests/src/Code/ISBNTest.php
diff --git a/module/VuFind/tests/Config/ReaderTest.php b/module/VuFind/tests/unit-tests/src/Config/ReaderTest.php
similarity index 100%
rename from module/VuFind/tests/Config/ReaderTest.php
rename to module/VuFind/tests/unit-tests/src/Config/ReaderTest.php
diff --git a/module/VuFind/tests/Config/SearchSpecsReaderTest.php b/module/VuFind/tests/unit-tests/src/Config/SearchSpecsReaderTest.php
similarity index 100%
rename from module/VuFind/tests/Config/SearchSpecsReaderTest.php
rename to module/VuFind/tests/unit-tests/src/Config/SearchSpecsReaderTest.php
diff --git a/module/VuFind/tests/Cookie/ContainerTest.php b/module/VuFind/tests/unit-tests/src/Cookie/ContainerTest.php
similarity index 100%
rename from module/VuFind/tests/Cookie/ContainerTest.php
rename to module/VuFind/tests/unit-tests/src/Cookie/ContainerTest.php
diff --git a/module/VuFind/tests/Date/ConverterTest.php b/module/VuFind/tests/unit-tests/src/Date/ConverterTest.php
similarity index 100%
rename from module/VuFind/tests/Date/ConverterTest.php
rename to module/VuFind/tests/unit-tests/src/Date/ConverterTest.php
diff --git a/module/VuFind/tests/Db/Table/ChangeTrackerTest.php b/module/VuFind/tests/unit-tests/src/Db/Table/ChangeTrackerTest.php
similarity index 100%
rename from module/VuFind/tests/Db/Table/ChangeTrackerTest.php
rename to module/VuFind/tests/unit-tests/src/Db/Table/ChangeTrackerTest.php
diff --git a/module/VuFind/tests/ILS/Driver/AlephTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/AlephTest.php
similarity index 100%
rename from module/VuFind/tests/ILS/Driver/AlephTest.php
rename to module/VuFind/tests/unit-tests/src/ILS/Driver/AlephTest.php
diff --git a/module/VuFind/tests/ILS/Driver/AmicusTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/AmicusTest.php
similarity index 100%
rename from module/VuFind/tests/ILS/Driver/AmicusTest.php
rename to module/VuFind/tests/unit-tests/src/ILS/Driver/AmicusTest.php
diff --git a/module/VuFind/tests/ILS/Driver/DAIATest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/DAIATest.php
similarity index 100%
rename from module/VuFind/tests/ILS/Driver/DAIATest.php
rename to module/VuFind/tests/unit-tests/src/ILS/Driver/DAIATest.php
diff --git a/module/VuFind/tests/ILS/Driver/DemoTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/DemoTest.php
similarity index 100%
rename from module/VuFind/tests/ILS/Driver/DemoTest.php
rename to module/VuFind/tests/unit-tests/src/ILS/Driver/DemoTest.php
diff --git a/module/VuFind/tests/ILS/Driver/EvergreenTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/EvergreenTest.php
similarity index 100%
rename from module/VuFind/tests/ILS/Driver/EvergreenTest.php
rename to module/VuFind/tests/unit-tests/src/ILS/Driver/EvergreenTest.php
diff --git a/module/VuFind/tests/ILS/Driver/HorizonTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/HorizonTest.php
similarity index 100%
rename from module/VuFind/tests/ILS/Driver/HorizonTest.php
rename to module/VuFind/tests/unit-tests/src/ILS/Driver/HorizonTest.php
diff --git a/module/VuFind/tests/ILS/Driver/HorizonXMLAPITest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/HorizonXMLAPITest.php
similarity index 100%
rename from module/VuFind/tests/ILS/Driver/HorizonXMLAPITest.php
rename to module/VuFind/tests/unit-tests/src/ILS/Driver/HorizonXMLAPITest.php
diff --git a/module/VuFind/tests/ILS/Driver/InnovativeTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/InnovativeTest.php
similarity index 100%
rename from module/VuFind/tests/ILS/Driver/InnovativeTest.php
rename to module/VuFind/tests/unit-tests/src/ILS/Driver/InnovativeTest.php
diff --git a/module/VuFind/tests/ILS/Driver/KohaTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/KohaTest.php
similarity index 100%
rename from module/VuFind/tests/ILS/Driver/KohaTest.php
rename to module/VuFind/tests/unit-tests/src/ILS/Driver/KohaTest.php
diff --git a/module/VuFind/tests/ILS/Driver/NewGenLibTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/NewGenLibTest.php
similarity index 100%
rename from module/VuFind/tests/ILS/Driver/NewGenLibTest.php
rename to module/VuFind/tests/unit-tests/src/ILS/Driver/NewGenLibTest.php
diff --git a/module/VuFind/tests/ILS/Driver/NoILSTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/NoILSTest.php
similarity index 100%
rename from module/VuFind/tests/ILS/Driver/NoILSTest.php
rename to module/VuFind/tests/unit-tests/src/ILS/Driver/NoILSTest.php
diff --git a/module/VuFind/tests/ILS/Driver/PICATest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/PICATest.php
similarity index 100%
rename from module/VuFind/tests/ILS/Driver/PICATest.php
rename to module/VuFind/tests/unit-tests/src/ILS/Driver/PICATest.php
diff --git a/module/VuFind/tests/ILS/Driver/SampleTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/SampleTest.php
similarity index 100%
rename from module/VuFind/tests/ILS/Driver/SampleTest.php
rename to module/VuFind/tests/unit-tests/src/ILS/Driver/SampleTest.php
diff --git a/module/VuFind/tests/ILS/Driver/SymphonyTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/SymphonyTest.php
similarity index 100%
rename from module/VuFind/tests/ILS/Driver/SymphonyTest.php
rename to module/VuFind/tests/unit-tests/src/ILS/Driver/SymphonyTest.php
diff --git a/module/VuFind/tests/ILS/Driver/UnicornTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/UnicornTest.php
similarity index 100%
rename from module/VuFind/tests/ILS/Driver/UnicornTest.php
rename to module/VuFind/tests/unit-tests/src/ILS/Driver/UnicornTest.php
diff --git a/module/VuFind/tests/ILS/Driver/VirtuaTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/VirtuaTest.php
similarity index 100%
rename from module/VuFind/tests/ILS/Driver/VirtuaTest.php
rename to module/VuFind/tests/unit-tests/src/ILS/Driver/VirtuaTest.php
diff --git a/module/VuFind/tests/ILS/Driver/VoyagerRestfulTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/VoyagerRestfulTest.php
similarity index 100%
rename from module/VuFind/tests/ILS/Driver/VoyagerRestfulTest.php
rename to module/VuFind/tests/unit-tests/src/ILS/Driver/VoyagerRestfulTest.php
diff --git a/module/VuFind/tests/ILS/Driver/VoyagerTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/VoyagerTest.php
similarity index 100%
rename from module/VuFind/tests/ILS/Driver/VoyagerTest.php
rename to module/VuFind/tests/unit-tests/src/ILS/Driver/VoyagerTest.php
diff --git a/module/VuFind/tests/ILS/Driver/XCNCIP2Test.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/XCNCIP2Test.php
similarity index 100%
rename from module/VuFind/tests/ILS/Driver/XCNCIP2Test.php
rename to module/VuFind/tests/unit-tests/src/ILS/Driver/XCNCIP2Test.php
diff --git a/module/VuFind/tests/ILS/Driver/XCNCIPTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/XCNCIPTest.php
similarity index 100%
rename from module/VuFind/tests/ILS/Driver/XCNCIPTest.php
rename to module/VuFind/tests/unit-tests/src/ILS/Driver/XCNCIPTest.php
diff --git a/module/VuFind/tests/RecordDriver/SolrMarcTest.php b/module/VuFind/tests/unit-tests/src/RecordDriver/SolrMarcTest.php
similarity index 100%
rename from module/VuFind/tests/RecordDriver/SolrMarcTest.php
rename to module/VuFind/tests/unit-tests/src/RecordDriver/SolrMarcTest.php
diff --git a/module/VuFind/tests/Search/Base/ParamsTest.php b/module/VuFind/tests/unit-tests/src/Search/Base/ParamsTest.php
similarity index 100%
rename from module/VuFind/tests/Search/Base/ParamsTest.php
rename to module/VuFind/tests/unit-tests/src/Search/Base/ParamsTest.php
diff --git a/module/VuFind/tests/Solr/UtilsTest.php b/module/VuFind/tests/unit-tests/src/Solr/UtilsTest.php
similarity index 100%
rename from module/VuFind/tests/Solr/UtilsTest.php
rename to module/VuFind/tests/unit-tests/src/Solr/UtilsTest.php
diff --git a/module/VuFind/tests/Theme/Root/Helper/CitationTest.php b/module/VuFind/tests/unit-tests/src/Theme/Root/Helper/CitationTest.php
similarity index 100%
rename from module/VuFind/tests/Theme/Root/Helper/CitationTest.php
rename to module/VuFind/tests/unit-tests/src/Theme/Root/Helper/CitationTest.php
diff --git a/module/VuFind/tests/Theme/Root/Helper/ResultFeedTest.php b/module/VuFind/tests/unit-tests/src/Theme/Root/Helper/ResultFeedTest.php
similarity index 100%
rename from module/VuFind/tests/Theme/Root/Helper/ResultFeedTest.php
rename to module/VuFind/tests/unit-tests/src/Theme/Root/Helper/ResultFeedTest.php