Finished with the storage dependency mess cleanup.

35 files changed, 72 insertions, 63 deletions

diff --git a/storage/src/tests/CMakeLists.txt b/storage/src/tests/CMakeLists.txt
index 03fbefed448..fb5bc146983 100644
--- a/storage/src/tests/CMakeLists.txt
+++ b/storage/src/tests/CMakeLists.txt
@@ -15,8 +15,5 @@ vespa_add_executable(storage_testrunner_app TEST
     storage_testfilestorage
     storage_testmemory
     storage_teststatus
-    storage
-    AFTER
-    storage_storageconfig
 )
 vespa_add_test(NAME storage_testrunner_app COMMAND storage_testrunner_app)
diff --git a/storage/src/tests/bucketdb/CMakeLists.txt b/storage/src/tests/bucketdb/CMakeLists.txt
index 2ba195e70e0..767c7ccf6fc 100644
--- a/storage/src/tests/bucketdb/CMakeLists.txt
+++ b/storage/src/tests/bucketdb/CMakeLists.txt
@@ -8,7 +8,7 @@ vespa_add_library(storage_testbucketdb TEST
     lockablemaptest.cpp
     bucketinfotest.cpp
     distribution_hash_normalizer_test.cpp
-    AFTER
-    storage_storageconfig
-    storage_bucketdb
+    DEPENDS
+    storage
+    storage_testcommon
 )
diff --git a/storage/src/tests/bucketdb/bucketinfotest.cpp b/storage/src/tests/bucketdb/bucketinfotest.cpp
index eef4c6d7739..9ee5895a41f 100644
--- a/storage/src/tests/bucketdb/bucketinfotest.cpp
+++ b/storage/src/tests/bucketdb/bucketinfotest.cpp
@@ -8,7 +8,7 @@
 #include <map>
 #include <vector>
 #include <vespa/vespalib/text/stringtokenizer.h>
-#include <vespa/storage/distributor/bucketdb/bucketinfo.h>
+#include <vespa/storage/bucketdb/bucketinfo.h>
 
 namespace storage {
 
diff --git a/storage/src/tests/bucketmover/CMakeLists.txt b/storage/src/tests/bucketmover/CMakeLists.txt
index 0ac5ec61a71..9181edcc644 100644
--- a/storage/src/tests/bucketmover/CMakeLists.txt
+++ b/storage/src/tests/bucketmover/CMakeLists.txt
@@ -5,6 +5,5 @@ vespa_add_library(storage_testbucketmover TEST
     htmltabletest.cpp
     DEPENDS
     storage
-    AFTER
-    storage_storageconfig
+    storage_testcommon
 )
diff --git a/storage/src/tests/common/CMakeLists.txt b/storage/src/tests/common/CMakeLists.txt
index 737815d85c2..13ac34c2726 100644
--- a/storage/src/tests/common/CMakeLists.txt
+++ b/storage/src/tests/common/CMakeLists.txt
@@ -6,7 +6,6 @@ vespa_add_library(storage_testcommon TEST
     metricstest.cpp
     storagelinktest.cpp
     teststorageapp.cpp
-    AFTER
-    storage_storageconfig
-    storage_bucketdb
+    DEPENDS
+    storage
 )
diff --git a/storage/src/tests/common/hostreporter/CMakeLists.txt b/storage/src/tests/common/hostreporter/CMakeLists.txt
index 9e3fabdcb29..8a849cf884f 100644
--- a/storage/src/tests/common/hostreporter/CMakeLists.txt
+++ b/storage/src/tests/common/hostreporter/CMakeLists.txt
@@ -8,6 +8,6 @@ vespa_add_library(storage_testhostreporter TEST
     diskreportertest.cpp
     util.cpp
     hostinfotest.cpp
-    AFTER
-    storage_storageconfig
+    DEPENDS
+    storage
 )
diff --git a/storage/src/tests/common/teststorageapp.h b/storage/src/tests/common/teststorageapp.h
index e7da9178743..e82b6d9d383 100644
--- a/storage/src/tests/common/teststorageapp.h
+++ b/storage/src/tests/common/teststorageapp.h
@@ -100,7 +100,7 @@ private:
     // Storage server interface implementation (until we can remove it)
     virtual api::Timestamp getUniqueTimestamp() { assert(0); throw; }
     virtual StorBucketDatabase& getStorageBucketDatabase() { assert(0); throw; }
-    virtual distributor::BucketDatabase& getBucketDatabase() { assert(0); throw; }
+    virtual BucketDatabase& getBucketDatabase() { assert(0); throw; }
     virtual uint16_t getDiskCount() const { assert(0); throw; }
 };
 
@@ -151,7 +151,7 @@ public:
 
     DistributorComponentRegisterImpl& getComponentRegister()
         { return _compReg; }
-    virtual distributor::BucketDatabase& getBucketDatabase()
+    virtual BucketDatabase& getBucketDatabase()
         { return _compReg.getBucketDatabase(); }
 
     virtual api::Timestamp getUniqueTimestamp();
diff --git a/storage/src/tests/distributor/CMakeLists.txt b/storage/src/tests/distributor/CMakeLists.txt
index 29bb8cb67c1..30751a01a30 100644
--- a/storage/src/tests/distributor/CMakeLists.txt
+++ b/storage/src/tests/distributor/CMakeLists.txt
@@ -38,6 +38,8 @@ vespa_add_library(storage_testdistributor TEST
     bucketgctimecalculatortest.cpp
     nodemaintenancestatstrackertest.cpp
     distributor_host_info_reporter_test.cpp
-    AFTER
-    storage_storageconfig
+    DEPENDS
+    storage_distributor
+    storage_testcommon
+    storage_testhostreporter
 )
diff --git a/storage/src/tests/distributor/bucketdbmetricupdatertest.cpp b/storage/src/tests/distributor/bucketdbmetricupdatertest.cpp
index 6aa9ef3a844..135d5c65110 100644
--- a/storage/src/tests/distributor/bucketdbmetricupdatertest.cpp
+++ b/storage/src/tests/distributor/bucketdbmetricupdatertest.cpp
@@ -3,8 +3,8 @@
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <string>
 #include <sstream>
+#include <vespa/storage/bucketdb/bucketdatabase.h>
 #include <vespa/storage/distributor/bucketdb/bucketdbmetricupdater.h>
-#include <vespa/storage/distributor/bucketdb/bucketdatabase.h>
 #include <vespa/storage/distributor/distributormetricsset.h>
 #include <vespa/storage/distributor/idealstatemetricsset.h>
 #include <vespa/storage/config/config-stor-distributormanager.h>
diff --git a/storage/src/tests/distributor/maintenanceschedulertest.cpp b/storage/src/tests/distributor/maintenanceschedulertest.cpp
index 4316bfd137c..dfc81c1110c 100644
--- a/storage/src/tests/distributor/maintenanceschedulertest.cpp
+++ b/storage/src/tests/distributor/maintenanceschedulertest.cpp
@@ -6,7 +6,7 @@
 #include <memory>
 #include <vespa/storage/distributor/maintenance/simplebucketprioritydatabase.h>
 #include <vespa/storage/distributor/maintenance/maintenancescheduler.h>
-#include <vespa/storage/distributor/bucketdb/mapbucketdatabase.h>
+#include <vespa/storage/bucketdb/mapbucketdatabase.h>
 #include <tests/distributor/maintenancemocks.h>
 
 namespace storage {
diff --git a/storage/src/tests/distributor/mapbucketdatabasetest.cpp b/storage/src/tests/distributor/mapbucketdatabasetest.cpp
index ab8e5add65f..fbc13d5a8a2 100644
--- a/storage/src/tests/distributor/mapbucketdatabasetest.cpp
+++ b/storage/src/tests/distributor/mapbucketdatabasetest.cpp
@@ -3,7 +3,7 @@
 #include <vespa/vespalib/util/document_runnable.h>
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <cppunit/extensions/HelperMacros.h>
-#include <vespa/storage/distributor/bucketdb/mapbucketdatabase.h>
+#include <vespa/storage/bucketdb/mapbucketdatabase.h>
 #include <vespa/storage/storageutil/utils.h>
 #include <tests/distributor/bucketdatabasetest.h>
 
diff --git a/storage/src/tests/distributor/simplemaintenancescannertest.cpp b/storage/src/tests/distributor/simplemaintenancescannertest.cpp
index 512a10bbd9a..3486f41149b 100644
--- a/storage/src/tests/distributor/simplemaintenancescannertest.cpp
+++ b/storage/src/tests/distributor/simplemaintenancescannertest.cpp
@@ -4,7 +4,7 @@
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/storage/distributor/maintenance/simplemaintenancescanner.h>
 #include <vespa/storage/distributor/maintenance/simplebucketprioritydatabase.h>
-#include <vespa/storage/distributor/bucketdb/mapbucketdatabase.h>
+#include <vespa/storage/bucketdb/mapbucketdatabase.h>
 #include <tests/distributor/maintenancemocks.h>
 
 #include <string>
diff --git a/storage/src/tests/frameworkimpl/memory/CMakeLists.txt b/storage/src/tests/frameworkimpl/memory/CMakeLists.txt
index 4d89a4aa548..77e0b9a2a9e 100644
--- a/storage/src/tests/frameworkimpl/memory/CMakeLists.txt
+++ b/storage/src/tests/frameworkimpl/memory/CMakeLists.txt
@@ -2,6 +2,7 @@
 vespa_add_library(storage_testmemory TEST
     SOURCES
     memorystatusviewertest.cpp
-    AFTER
-    storage_storageconfig
+    DEPENDS
+    storage
+    storage_testcommon
 )
diff --git a/storage/src/tests/frameworkimpl/status/CMakeLists.txt b/storage/src/tests/frameworkimpl/status/CMakeLists.txt
index 95c4d3a532e..2de52df1f7f 100644
--- a/storage/src/tests/frameworkimpl/status/CMakeLists.txt
+++ b/storage/src/tests/frameworkimpl/status/CMakeLists.txt
@@ -2,6 +2,7 @@
 vespa_add_library(storage_teststatus TEST
     SOURCES
     statustest.cpp
-    AFTER
-    storage_storageconfig
+    DEPENDS
+    storage
+    storage_testcommon
 )
diff --git a/storage/src/tests/persistence/CMakeLists.txt b/storage/src/tests/persistence/CMakeLists.txt
index db0ac64c183..8863b3d0467 100644
--- a/storage/src/tests/persistence/CMakeLists.txt
+++ b/storage/src/tests/persistence/CMakeLists.txt
@@ -5,7 +5,6 @@ vespa_add_library(storage_testpersistence TEST
     persistencetestutils.cpp
     splitbitdetectortest.cpp
     legacyoperationhandlertest.cpp
-    persistenceproviderwrapper.cpp
     diskmoveoperationhandlertest.cpp
     providershutdownwrappertest.cpp
     mergehandlertest.cpp
@@ -13,6 +12,8 @@ vespa_add_library(storage_testpersistence TEST
     bucketownershipnotifiertest.cpp
     persistencequeuetest.cpp
     testandsettest.cpp
-    AFTER
-    storage_storageconfig
+    DEPENDS
+    storage
+    storage_testdistributor
+    storage_testpersistence_common
 )
diff --git a/storage/src/tests/persistence/common/CMakeLists.txt b/storage/src/tests/persistence/common/CMakeLists.txt
new file mode 100644
index 00000000000..561f516b8d1
--- /dev/null
+++ b/storage/src/tests/persistence/common/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_library(storage_testpersistence_common TEST
+    SOURCES
+    persistenceproviderwrapper.cpp
+    filestortestfixture.cpp
+    DEPENDS
+    persistence
+    storage_testcommon
+)
diff --git a/storage/src/tests/persistence/filestorage/filestortestfixture.cpp b/storage/src/tests/persistence/common/filestortestfixture.cpp
index 69b109b5cfc..8f7a95f53c8 100644
--- a/storage/src/tests/persistence/filestorage/filestortestfixture.cpp
+++ b/storage/src/tests/persistence/common/filestortestfixture.cpp
@@ -5,7 +5,7 @@
 #include <vespa/storage/persistence/messages.h>
 #include <vespa/storage/persistence/filestorage/filestormanager.h>
 #include <vespa/persistence/dummyimpl/dummypersistence.h>
-#include <tests/persistence/filestorage/filestortestfixture.h>
+#include <tests/persistence/common/filestortestfixture.h>
 
 namespace storage {
 
diff --git a/storage/src/tests/persistence/filestorage/filestortestfixture.h b/storage/src/tests/persistence/common/filestortestfixture.h
index 4f1de549f47..4f1de549f47 100644
--- a/storage/src/tests/persistence/filestorage/filestortestfixture.h
+++ b/storage/src/tests/persistence/common/filestortestfixture.h
diff --git a/storage/src/tests/persistence/persistenceproviderwrapper.cpp b/storage/src/tests/persistence/common/persistenceproviderwrapper.cpp
index 4a09235ddce..9ec66590b24 100644
--- a/storage/src/tests/persistence/persistenceproviderwrapper.cpp
+++ b/storage/src/tests/persistence/common/persistenceproviderwrapper.cpp
@@ -2,7 +2,7 @@
 #include <vespa/fastos/fastos.h>
 #include <iostream>
 #include <sstream>
-#include <tests/persistence/persistenceproviderwrapper.h>
+#include <tests/persistence/common/persistenceproviderwrapper.h>
 
 #define LOG_SPI(ops) \
     { \
diff --git a/storage/src/tests/persistence/persistenceproviderwrapper.h b/storage/src/tests/persistence/common/persistenceproviderwrapper.h
index b115eb7ef3d..b115eb7ef3d 100644
--- a/storage/src/tests/persistence/persistenceproviderwrapper.h
+++ b/storage/src/tests/persistence/common/persistenceproviderwrapper.h
diff --git a/storage/src/tests/persistence/filestorage/CMakeLists.txt b/storage/src/tests/persistence/filestorage/CMakeLists.txt
index 2ccebdd8a96..f253d42e460 100644
--- a/storage/src/tests/persistence/filestorage/CMakeLists.txt
+++ b/storage/src/tests/persistence/filestorage/CMakeLists.txt
@@ -3,7 +3,6 @@ vespa_add_library(storage_testfilestorage TEST
     SOURCES
     filestormanagertest.cpp
     operationabortingtest.cpp
-    filestortestfixture.cpp
     mergeblockingtest.cpp
     sanitycheckeddeletetest.cpp
     deactivatebucketstest.cpp
@@ -11,7 +10,8 @@ vespa_add_library(storage_testfilestorage TEST
     filestormodifiedbucketstest.cpp
     deletebuckettest.cpp
     singlebucketjointest.cpp
-    AFTER
-    storage_bucketdb
-    storage_storageconfig
+    DEPENDS
+    storage
+    storageapi
+    storage_testpersistence_common
 )
diff --git a/storage/src/tests/persistence/filestorage/deactivatebucketstest.cpp b/storage/src/tests/persistence/filestorage/deactivatebucketstest.cpp
index 6de67a3fec0..c4e3ef97eb2 100644
--- a/storage/src/tests/persistence/filestorage/deactivatebucketstest.cpp
+++ b/storage/src/tests/persistence/filestorage/deactivatebucketstest.cpp
@@ -4,9 +4,9 @@
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/storageapi/message/bucket.h>
 #include <vespa/storageapi/message/state.h>
-#include <tests/persistence/persistenceproviderwrapper.h>
+#include <tests/persistence/common/persistenceproviderwrapper.h>
 #include <vespa/persistence/dummyimpl/dummypersistence.h>
-#include <tests/persistence/filestorage/filestortestfixture.h>
+#include <tests/persistence/common/filestortestfixture.h>
 
 namespace storage {
 
diff --git a/storage/src/tests/persistence/filestorage/deletebuckettest.cpp b/storage/src/tests/persistence/filestorage/deletebuckettest.cpp
index 08ca9bc68fa..d415db1b45e 100644
--- a/storage/src/tests/persistence/filestorage/deletebuckettest.cpp
+++ b/storage/src/tests/persistence/filestorage/deletebuckettest.cpp
@@ -4,9 +4,9 @@
 #include <vespa/log/log.h>
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/storageapi/message/bucket.h>
-#include <tests/persistence/persistenceproviderwrapper.h>
+#include <tests/persistence/common/persistenceproviderwrapper.h>
 #include <vespa/persistence/dummyimpl/dummypersistence.h>
-#include <tests/persistence/filestorage/filestortestfixture.h>
+#include <tests/persistence/common/filestortestfixture.h>
 
 LOG_SETUP(".deletebuckettest");
 
diff --git a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
index 0ffbe9fa440..251b2474154 100644
--- a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
+++ b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
@@ -2264,7 +2264,7 @@ FileStorManagerTest::testDeleteBucketRejectOutdatedBucketInfo()
     {
         std::shared_ptr<api::DeleteBucketCommand> cmd(
                 new api::DeleteBucketCommand(bid));
-        cmd->setBucketInfo(BucketInfo(0xf000baaa, 1, 123, 1, 456));
+        cmd->setBucketInfo(api::BucketInfo(0xf000baaa, 1, 123, 1, 456));
         cmd->setAddress(address);
         top.sendDown(cmd);
         top.waitForMessages(1, _waitTime);
@@ -2777,7 +2777,7 @@ FileStorManagerTest::testGetIter()
                     _node->getTestDocMan().createRandomDocumentAtLocation(
                         4000, i, 400, 400)));
     }
-    BucketInfo bucketInfo;
+    api::BucketInfo bucketInfo;
         // Putting all docs to have something to visit
     for (uint32_t i=0; i<docs.size(); ++i) {
         std::shared_ptr<api::PutCommand> cmd(
diff --git a/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp b/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp
index 19b84ef475b..8d6a8fb8e03 100644
--- a/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp
+++ b/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp
@@ -4,9 +4,9 @@
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/storageapi/message/bucket.h>
 #include <vespa/storage/persistence/filestorage/modifiedbucketchecker.h>
-#include <tests/persistence/persistenceproviderwrapper.h>
+#include <tests/persistence/common/persistenceproviderwrapper.h>
 #include <vespa/persistence/dummyimpl/dummypersistence.h>
-#include <tests/persistence/filestorage/filestortestfixture.h>
+#include <tests/persistence/common/filestortestfixture.h>
 
 namespace storage {
 
diff --git a/storage/src/tests/persistence/filestorage/mergeblockingtest.cpp b/storage/src/tests/persistence/filestorage/mergeblockingtest.cpp
index ff9ec063555..fd106fb3117 100644
--- a/storage/src/tests/persistence/filestorage/mergeblockingtest.cpp
+++ b/storage/src/tests/persistence/filestorage/mergeblockingtest.cpp
@@ -4,9 +4,9 @@
 #include <vector>
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/storage/persistence/messages.h>
-#include <tests/persistence/persistenceproviderwrapper.h>
+#include <tests/persistence/common/persistenceproviderwrapper.h>
 #include <vespa/persistence/dummyimpl/dummypersistence.h>
-#include <tests/persistence/filestorage/filestortestfixture.h>
+#include <tests/persistence/common/filestortestfixture.h>
 
 namespace storage {
 
diff --git a/storage/src/tests/persistence/filestorage/operationabortingtest.cpp b/storage/src/tests/persistence/filestorage/operationabortingtest.cpp
index 0d6583cacdb..e0d2bae9a44 100644
--- a/storage/src/tests/persistence/filestorage/operationabortingtest.cpp
+++ b/storage/src/tests/persistence/filestorage/operationabortingtest.cpp
@@ -4,9 +4,9 @@
 #include <vector>
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/storage/persistence/messages.h>
-#include <tests/persistence/persistenceproviderwrapper.h>
+#include <tests/persistence/common/persistenceproviderwrapper.h>
 #include <vespa/persistence/dummyimpl/dummypersistence.h>
-#include <tests/persistence/filestorage/filestortestfixture.h>
+#include <tests/persistence/common/filestortestfixture.h>
 #include <vespa/vespalib/util/barrier.h>
 #include <vespa/vespalib/util/thread.h>
 
diff --git a/storage/src/tests/persistence/filestorage/sanitycheckeddeletetest.cpp b/storage/src/tests/persistence/filestorage/sanitycheckeddeletetest.cpp
index 9b492a3aaa6..19841e98e85 100644
--- a/storage/src/tests/persistence/filestorage/sanitycheckeddeletetest.cpp
+++ b/storage/src/tests/persistence/filestorage/sanitycheckeddeletetest.cpp
@@ -3,9 +3,9 @@
 #include <vespa/fastos/fastos.h>
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/storageapi/message/bucket.h>
-#include <tests/persistence/persistenceproviderwrapper.h>
+#include <tests/persistence/common/persistenceproviderwrapper.h>
 #include <vespa/persistence/dummyimpl/dummypersistence.h>
-#include <tests/persistence/filestorage/filestortestfixture.h>
+#include <tests/persistence/common/filestortestfixture.h>
 
 namespace storage {
 
diff --git a/storage/src/tests/persistence/filestorage/singlebucketjointest.cpp b/storage/src/tests/persistence/filestorage/singlebucketjointest.cpp
index 480652207d3..c754ca353af 100644
--- a/storage/src/tests/persistence/filestorage/singlebucketjointest.cpp
+++ b/storage/src/tests/persistence/filestorage/singlebucketjointest.cpp
@@ -5,9 +5,9 @@
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/storageapi/message/bucket.h>
 #include <vespa/storageapi/message/bucketsplitting.h>
-#include <tests/persistence/persistenceproviderwrapper.h>
+#include <tests/persistence/common/persistenceproviderwrapper.h>
 #include <vespa/persistence/dummyimpl/dummypersistence.h>
-#include <tests/persistence/filestorage/filestortestfixture.h>
+#include <tests/persistence/common/filestortestfixture.h>
 
 LOG_SETUP(".singlebucketjointest");
 
diff --git a/storage/src/tests/persistence/mergehandlertest.cpp b/storage/src/tests/persistence/mergehandlertest.cpp
index b0ec11a3e46..48d2ef2dc61 100644
--- a/storage/src/tests/persistence/mergehandlertest.cpp
+++ b/storage/src/tests/persistence/mergehandlertest.cpp
@@ -7,7 +7,7 @@
 #include <vespa/storageapi/message/bucket.h>
 #include <vespa/log/log.h>
 #include <tests/persistence/persistencetestutils.h>
-#include <tests/persistence/persistenceproviderwrapper.h>
+#include <tests/persistence/common/persistenceproviderwrapper.h>
 #include <tests/distributor/messagesenderstub.h>
 #include <vespa/storageframework/defaultimplementation/clock/fakeclock.h>
 #include <cmath>
diff --git a/storage/src/tests/persistence/persistencequeuetest.cpp b/storage/src/tests/persistence/persistencequeuetest.cpp
index 06daf2a975c..3a262c01d54 100644
--- a/storage/src/tests/persistence/persistencequeuetest.cpp
+++ b/storage/src/tests/persistence/persistencequeuetest.cpp
@@ -4,9 +4,9 @@
 #include <vespa/log/log.h>
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/storageapi/message/bucket.h>
-#include <tests/persistence/persistenceproviderwrapper.h>
+#include <tests/persistence/common/persistenceproviderwrapper.h>
 #include <vespa/persistence/dummyimpl/dummypersistence.h>
-#include <tests/persistence/filestorage/filestortestfixture.h>
+#include <tests/persistence/common/filestortestfixture.h>
 #include <tests/persistence/filestorage/forwardingmessagesender.h>
 
 LOG_SETUP(".persistencequeuetest");
diff --git a/storage/src/tests/persistence/providershutdownwrappertest.cpp b/storage/src/tests/persistence/providershutdownwrappertest.cpp
index 0731dcb155a..1d2bf08e0c4 100644
--- a/storage/src/tests/persistence/providershutdownwrappertest.cpp
+++ b/storage/src/tests/persistence/providershutdownwrappertest.cpp
@@ -3,7 +3,7 @@
 #include <vespa/fastos/fastos.h>
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <tests/persistence/persistencetestutils.h>
-#include <tests/persistence/persistenceproviderwrapper.h>
+#include <tests/persistence/common/persistenceproviderwrapper.h>
 #include <vespa/storage/persistence/providershutdownwrapper.h>
 
 namespace storage {
diff --git a/storage/src/tests/storageserver/CMakeLists.txt b/storage/src/tests/storageserver/CMakeLists.txt
index dacd37d8ea7..e415c76ae83 100644
--- a/storage/src/tests/storageserver/CMakeLists.txt
+++ b/storage/src/tests/storageserver/CMakeLists.txt
@@ -11,7 +11,7 @@ vespa_add_library(storage_teststorageserver TEST
     priorityconvertertest.cpp
     statereportertest.cpp
     changedbucketownershiphandlertest.cpp
-    AFTER
-    storage_bucketdb
-    storage_storageconfig
+    DEPENDS
+    storage_storageserver
+    storage_testcommon
 )
diff --git a/storage/src/tests/storageutil/CMakeLists.txt b/storage/src/tests/storageutil/CMakeLists.txt
index e49361285d8..5fc955a0b1e 100644
--- a/storage/src/tests/storageutil/CMakeLists.txt
+++ b/storage/src/tests/storageutil/CMakeLists.txt
@@ -4,6 +4,6 @@ vespa_add_library(storage_teststorageutil TEST
     functortest.cpp
     charttest.cpp
     palettetest.cpp
-    AFTER
-    storage_storageconfig
+    DEPENDS
+    storage
 )
diff --git a/storage/src/tests/visiting/CMakeLists.txt b/storage/src/tests/visiting/CMakeLists.txt
index f1c10bde4f0..de73896a203 100644
--- a/storage/src/tests/visiting/CMakeLists.txt
+++ b/storage/src/tests/visiting/CMakeLists.txt
@@ -5,7 +5,7 @@ vespa_add_library(storage_testvisiting TEST
     visitormanagertest.cpp
     visitortest.cpp
     memory_bounded_trace_test.cpp
-    AFTER
-    storage_storageconfig
-    storage_visitor
+    DEPENDS
+    storage
+    storage_teststorageserver
 )