add override in storage tests

56 files changed, 136 insertions, 136 deletions

diff --git a/storage/src/tests/bucketdb/bucketmanagertest.cpp b/storage/src/tests/bucketdb/bucketmanagertest.cpp
index 9277429eedd..f9ae4f57fa5 100644
--- a/storage/src/tests/bucketdb/bucketmanagertest.cpp
+++ b/storage/src/tests/bucketdb/bucketmanagertest.cpp
@@ -153,11 +153,11 @@ public:
     static constexpr uint32_t MESSAGE_WAIT_TIME = 60*2;
 
 
-    void setUp() {
+    void setUp() override {
         _emptyBuckets = 0;
     }
 
-    void tearDown() {
+    void tearDown() override {
     }
 
     friend class ConcurrentOperationFixture;
diff --git a/storage/src/tests/bucketdb/initializertest.cpp b/storage/src/tests/bucketdb/initializertest.cpp
index 05e00184ce3..9aa7da92e36 100644
--- a/storage/src/tests/bucketdb/initializertest.cpp
+++ b/storage/src/tests/bucketdb/initializertest.cpp
@@ -423,7 +423,7 @@ struct FakePersistenceLayer : public StorageLink {
         }
         return 0;
     }
-    virtual bool onDown(const api::StorageMessage::SP& msg) {
+    virtual bool onDown(const api::StorageMessage::SP& msg) override {
         fatalError = "";
         if (messageCallback) {
             messageCallback->onMessage(*msg);
@@ -795,7 +795,7 @@ struct DatabaseInsertCallback : MessageCallback
           _expectedReadBucketPriority(255)
     {}
 
-    void onMessage(const api::StorageMessage& msg)
+    void onMessage(const api::StorageMessage& msg) override
     {
         // Always make sure we're not set as initialized while we're still
         // processing messages! Also ensure progress never goes down.
diff --git a/storage/src/tests/bucketdb/lockablemaptest.cpp b/storage/src/tests/bucketdb/lockablemaptest.cpp
index f18e0edc02a..91f273928d6 100644
--- a/storage/src/tests/bucketdb/lockablemaptest.cpp
+++ b/storage/src/tests/bucketdb/lockablemaptest.cpp
@@ -354,7 +354,7 @@ namespace {
     struct InsertEraseLoadGiver : public LoadGiver {
         InsertEraseLoadGiver(Map& map) : LoadGiver(map) {}
 
-        void run() {
+        void run() override {
                 // Screws up order of buckets by xor'ing with 12345.
                 // Only operate on last 32k super buckets.
             while (running()) {
@@ -375,7 +375,7 @@ namespace {
     struct GetLoadGiver : public LoadGiver {
         GetLoadGiver(Map& map) : LoadGiver(map) {}
 
-        void run() {
+        void run() override {
                 // It's legal to keep entries as long as you only request higher
                 // buckets. So, to test this, keep entries until you request one
                 // that is smaller than those stored.
@@ -395,7 +395,7 @@ namespace {
     struct AllLoadGiver : public LoadGiver {
         AllLoadGiver(Map& map) : LoadGiver(map) {}
 
-        void run() {
+        void run() override {
             while (running()) {
                 _map.all(*this, "foo");
                 ++_counter;
@@ -413,7 +413,7 @@ namespace {
     struct EachLoadGiver : public LoadGiver {
         EachLoadGiver(Map& map) : LoadGiver(map) {}
 
-        void run() {
+        void run() override {
             while (running()) {
                 _map.each(*this, "foo");
                 ++_counter;
@@ -431,7 +431,7 @@ namespace {
     struct RandomRangeLoadGiver : public LoadGiver {
         RandomRangeLoadGiver(Map& map) : LoadGiver(map) {}
 
-        void run() {
+        void run() override {
             while (running()) {
                 uint32_t min = (_counter ^ 23426) % 0x10000;
                 uint32_t max = (_counter ^ 40612) % 0x10000;
@@ -460,7 +460,7 @@ namespace {
     struct GetNextLoadGiver : public LoadGiver {
         GetNextLoadGiver(Map& map) : LoadGiver(map) {}
 
-        void run() {
+        void run() override {
             while (running()) {
                 uint32_t bucket = (_counter ^ 60417) % 0xffff;
                 if (_counter % 7 < 5) {
diff --git a/storage/src/tests/bucketmover/bucketmovertest.cpp b/storage/src/tests/bucketmover/bucketmovertest.cpp
index 2720e6bac2a..3a844b6d1d8 100644
--- a/storage/src/tests/bucketmover/bucketmovertest.cpp
+++ b/storage/src/tests/bucketmover/bucketmovertest.cpp
@@ -16,8 +16,8 @@ namespace bucketmover {
 
 struct BucketMoverTest : public CppUnit::TestFixture {
 public:
-    void setUp();
-    void tearDown();
+    void setUp() override;
+    void tearDown() override;
 
     void testNormalUsage();
     void testMaxPending();
diff --git a/storage/src/tests/common/dummystoragelink.h b/storage/src/tests/common/dummystoragelink.h
index 072d961cbc0..34206e3d271 100644
--- a/storage/src/tests/common/dummystoragelink.h
+++ b/storage/src/tests/common/dummystoragelink.h
@@ -33,14 +33,14 @@ public:
     DummyStorageLink();
     ~DummyStorageLink();
 
-    bool onDown(const api::StorageMessage::SP&);
-    bool onUp(const api::StorageMessage::SP&);
+    bool onDown(const api::StorageMessage::SP&) override;
+    bool onUp(const api::StorageMessage::SP&) override;
 
     void addOnTopOfChain(StorageLink& link) {
         link.addTestLinkOnTop(this);
     }
 
-    void print(std::ostream& ost, bool verbose, const std::string& indent) const
+    void print(std::ostream& ost, bool verbose, const std::string& indent) const override
     {
         (void) verbose;
         ost << indent << "DummyStorageLink("
diff --git a/storage/src/tests/common/metricstest.cpp b/storage/src/tests/common/metricstest.cpp
index 5ee7d4633ad..8dea2fad94f 100644
--- a/storage/src/tests/common/metricstest.cpp
+++ b/storage/src/tests/common/metricstest.cpp
@@ -40,8 +40,8 @@ struct MetricsTest : public CppUnit::TestFixture {
 
     MetricsTest();
 
-    void setUp();
-    void tearDown();
+    void setUp() override;
+    void tearDown() override;
     void runLoad(uint32_t count = 1);
     void createFakeLoad();
 
@@ -67,9 +67,9 @@ namespace {
     {
         framework::Clock& _clock;
         MetricClock(framework::Clock& c) : _clock(c) {}
-        virtual time_t getTime() const
+        virtual time_t getTime() const override
             { return _clock.getTimeInSeconds().getTime(); }
-        virtual time_t getTimeInMilliSecs() const
+        virtual time_t getTimeInMilliSecs() const override
             { return _clock.getTimeInMillis().getTime(); }
     };
 }
diff --git a/storage/src/tests/distributor/blockingoperationstartertest.cpp b/storage/src/tests/distributor/blockingoperationstartertest.cpp
index ee0058643d9..2ae8a819d7e 100644
--- a/storage/src/tests/distributor/blockingoperationstartertest.cpp
+++ b/storage/src/tests/distributor/blockingoperationstartertest.cpp
@@ -40,7 +40,7 @@ public:
     void testOperationNotBlockedWhenNoMessagesPending();
     void testOperationBlockedWhenMessagesPending();
 
-    void setUp();
+    void setUp() override;
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(BlockingOperationStarterTest);
diff --git a/storage/src/tests/distributor/bucketdatabasetest.cpp b/storage/src/tests/distributor/bucketdatabasetest.cpp
index 011b02c8f89..13a8aff239c 100644
--- a/storage/src/tests/distributor/bucketdatabasetest.cpp
+++ b/storage/src/tests/distributor/bucketdatabasetest.cpp
@@ -73,7 +73,7 @@ namespace {
 
 struct ModifyProcessor : public BucketDatabase::MutableEntryProcessor
 {
-    bool process(BucketDatabase::Entry& e) {
+    bool process(BucketDatabase::Entry& e) override {
         if (e.getBucketId() == document::BucketId(16, 0x0b)) {
             e.getBucketInfo() = BI(7);
         } else if (e.getBucketId() == document::BucketId(16, 0x2a)) {
@@ -90,7 +90,7 @@ struct ListAllProcessor : public BucketDatabase::EntryProcessor
 {
     std::ostringstream ost;
 
-    bool process(const BucketDatabase::Entry& e) {
+    bool process(const BucketDatabase::Entry& e) override {
         ost << e << "\n";
         return true;
     }
@@ -100,7 +100,7 @@ struct DummyProcessor : public BucketDatabase::EntryProcessor
 {
     std::ostringstream ost;
 
-    bool process(const BucketDatabase::Entry&) {
+    bool process(const BucketDatabase::Entry&) override {
         return true;
     }
 };
@@ -110,7 +110,7 @@ struct StoppingProcessor : public BucketDatabase::EntryProcessor
 {
     std::ostringstream ost;
 
-    bool process(const BucketDatabase::Entry& e) {
+    bool process(const BucketDatabase::Entry& e) override {
         ost << e << "\n";
 
         if (e.getBucketId() == document::BucketId(16, 0x2a)) {
diff --git a/storage/src/tests/distributor/bucketdbupdatertest.cpp b/storage/src/tests/distributor/bucketdbupdatertest.cpp
index e0c0a76f3e7..d89ce2a03d0 100644
--- a/storage/src/tests/distributor/bucketdbupdatertest.cpp
+++ b/storage/src/tests/distributor/bucketdbupdatertest.cpp
@@ -141,11 +141,11 @@ protected:
     }
 
 public:
-    void setUp() {
+    void setUp() override {
         createLinks();
     };
 
-    void tearDown() {
+    void tearDown() override {
         close();
     }
 
@@ -1746,7 +1746,7 @@ struct BucketDumper : public BucketDatabase::EntryProcessor
     {
     }
 
-    bool process(const BucketDatabase::Entry& e) {
+    bool process(const BucketDatabase::Entry& e) override {
         document::BucketId bucketId(e.getBucketId());
 
         ost << (uint32_t)bucketId.getRawId() << ":";
diff --git a/storage/src/tests/distributor/bucketstateoperationtest.cpp b/storage/src/tests/distributor/bucketstateoperationtest.cpp
index 67346626ad0..74a31de1541 100644
--- a/storage/src/tests/distributor/bucketstateoperationtest.cpp
+++ b/storage/src/tests/distributor/bucketstateoperationtest.cpp
@@ -28,12 +28,12 @@ private:
     void testBucketDbNotUpdatedOnFailure();
 
 public:
-    void setUp()
+    void setUp() override
     {
         createLinks();
     }
 
-    void tearDown()
+    void tearDown() override
     {
         close();
     }
diff --git a/storage/src/tests/distributor/distributor_host_info_reporter_test.cpp b/storage/src/tests/distributor/distributor_host_info_reporter_test.cpp
index c1b5487717e..e7078f08d0a 100644
--- a/storage/src/tests/distributor/distributor_host_info_reporter_test.cpp
+++ b/storage/src/tests/distributor/distributor_host_info_reporter_test.cpp
@@ -58,7 +58,7 @@ struct MockedLatencyStatisticsProvider : LatencyStatisticsProvider
 {
     NodeStatsSnapshot returnedSnapshot;
 
-    NodeStatsSnapshot doGetLatencyStatistics() const {
+    NodeStatsSnapshot doGetLatencyStatistics() const override {
         return returnedSnapshot;
     }
 };
diff --git a/storage/src/tests/distributor/distributortest.cpp b/storage/src/tests/distributor/distributortest.cpp
index 40359ef460f..fc09dc17c1f 100644
--- a/storage/src/tests/distributor/distributortest.cpp
+++ b/storage/src/tests/distributor/distributortest.cpp
@@ -75,11 +75,11 @@ protected:
     void configured_safe_time_point_rejection_works_end_to_end();
 
 public:
-    void setUp() {
+    void setUp() override {
         createLinks();
     };
 
-    void tearDown() {
+    void tearDown() override {
         close();
     }
 
@@ -375,7 +375,7 @@ public:
     StatusRequestThread(StatusReporterDelegate& reporter)
         : _reporter(reporter)
     {}
-    void run(framework::ThreadHandle&) {
+    void run(framework::ThreadHandle&) override {
         framework::HttpUrlPath path("/distributor?page=buckets");
         std::ostringstream stream;
         _reporter.reportStatus(stream, path);
diff --git a/storage/src/tests/distributor/garbagecollectiontest.cpp b/storage/src/tests/distributor/garbagecollectiontest.cpp
index 73d872d3331..7f9098778cf 100644
--- a/storage/src/tests/distributor/garbagecollectiontest.cpp
+++ b/storage/src/tests/distributor/garbagecollectiontest.cpp
@@ -20,11 +20,11 @@ protected:
     void testSimple();
 
 public:
-    void setUp() {
+    void setUp() override {
         createLinks();
     };
 
-    void tearDown() {
+    void tearDown() override {
         close();
     }
 };
diff --git a/storage/src/tests/distributor/getoperationtest.cpp b/storage/src/tests/distributor/getoperationtest.cpp
index 15e87e4747b..f50ac81c0ad 100644
--- a/storage/src/tests/distributor/getoperationtest.cpp
+++ b/storage/src/tests/distributor/getoperationtest.cpp
@@ -52,7 +52,7 @@ public:
     document::BucketId bucketId;
     std::unique_ptr<Operation> op;
 
-    void setUp() {
+    void setUp() override {
         _repo.reset(
                 new document::DocumentTypeRepo(*ConfigGetter<DocumenttypesConfig>::
                         getConfig("config-doctypes",
@@ -63,7 +63,7 @@ public:
         bucketId = getExternalOperationHandler().getBucketId(docId);
     };
 
-    void tearDown() {
+    void tearDown() override {
         close();
         op.reset();
     }
diff --git a/storage/src/tests/distributor/idealstatemanagertest.cpp b/storage/src/tests/distributor/idealstatemanagertest.cpp
index 0522f0d4bc2..2b861d23c5e 100644
--- a/storage/src/tests/distributor/idealstatemanagertest.cpp
+++ b/storage/src/tests/distributor/idealstatemanagertest.cpp
@@ -20,11 +20,11 @@ class IdealStateManagerTest : public CppUnit::TestFixture,
 {
 public:
     IdealStateManagerTest() {}
-    void setUp() {
+    void setUp() override {
         createLinks();
     };
 
-    void tearDown() {
+    void tearDown() override {
         close();
     }
 
diff --git a/storage/src/tests/distributor/joinbuckettest.cpp b/storage/src/tests/distributor/joinbuckettest.cpp
index 2e80605cc47..d817c7f14e0 100644
--- a/storage/src/tests/distributor/joinbuckettest.cpp
+++ b/storage/src/tests/distributor/joinbuckettest.cpp
@@ -25,11 +25,11 @@ protected:
     void sendSparseJoinsToNodesWithoutBothSourceBuckets();
 
 public:
-    void setUp() {
+    void setUp() override {
         createLinks();
     };
 
-    void tearDown() {
+    void tearDown() override {
         close();
     }
 };
diff --git a/storage/src/tests/distributor/maintenanceschedulertest.cpp b/storage/src/tests/distributor/maintenanceschedulertest.cpp
index dfc81c1110c..52ae9f6c8a6 100644
--- a/storage/src/tests/distributor/maintenanceschedulertest.cpp
+++ b/storage/src/tests/distributor/maintenanceschedulertest.cpp
@@ -39,7 +39,7 @@ public:
     void testSuppressLowPrioritiesInEmergencyMode();
     void testPriorityNotClearedIfOperationNotStarted();
 
-    void setUp();
+    void setUp() override;
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(MaintenanceSchedulerTest);
diff --git a/storage/src/tests/distributor/mapbucketdatabasetest.cpp b/storage/src/tests/distributor/mapbucketdatabasetest.cpp
index fbc13d5a8a2..6892f522bba 100644
--- a/storage/src/tests/distributor/mapbucketdatabasetest.cpp
+++ b/storage/src/tests/distributor/mapbucketdatabasetest.cpp
@@ -13,7 +13,7 @@ namespace distributor {
 struct MapBucketDatabaseTest : public BucketDatabaseTest {
     MapBucketDatabase _db;
 
-    virtual BucketDatabase& db() { return _db; };
+    virtual BucketDatabase& db() override { return _db; }
 
     CPPUNIT_TEST_SUITE(MapBucketDatabaseTest);
     SETUP_DATABASE_TESTS();
diff --git a/storage/src/tests/distributor/mergeoperationtest.cpp b/storage/src/tests/distributor/mergeoperationtest.cpp
index bd71b69673a..875d16a42ed 100644
--- a/storage/src/tests/distributor/mergeoperationtest.cpp
+++ b/storage/src/tests/distributor/mergeoperationtest.cpp
@@ -41,13 +41,13 @@ protected:
     void onlyMarkRedundantRetiredReplicasAsSourceOnly();
 
 public:
-    void setUp() {
+    void setUp() override {
         createLinks();
         _pendingTracker.reset(new PendingMessageTracker(getComponentRegister()));
         _sender.setPendingMessageTracker(*_pendingTracker);
     }
 
-    void tearDown() {
+    void tearDown() override {
         close();
     }
 };
diff --git a/storage/src/tests/distributor/operationtargetresolvertest.cpp b/storage/src/tests/distributor/operationtargetresolvertest.cpp
index 36dc849d964..26144ac950e 100644
--- a/storage/src/tests/distributor/operationtargetresolvertest.cpp
+++ b/storage/src/tests/distributor/operationtargetresolvertest.cpp
@@ -44,7 +44,7 @@ struct OperationTargetResolverTest : public CppUnit::TestFixture,
     BucketInstanceList getInstances(const BucketId& bid,
                                     bool stripToRedundancy);
 
-    void setUp() {
+    void setUp() override {
         _repo.reset(new document::DocumentTypeRepo(
                 *config::ConfigGetter<document::DocumenttypesConfig>::getConfig(
                     "config-doctypes",
@@ -53,7 +53,7 @@ struct OperationTargetResolverTest : public CppUnit::TestFixture,
         createLinks();
     };
 
-    void tearDown() {
+    void tearDown() override {
         close();
     }
 
@@ -84,7 +84,7 @@ namespace {
     { \
         struct MyAsserter : public Asserter { \
             void assertEqualMsg(std::string t1, OperationTargetList t2, \
-                                OperationTargetList t3) { \
+                                OperationTargetList t3) override { \
                 CPPUNIT_ASSERT_EQUAL_MSG(t1, t2, t3); \
             } \
         }; \
diff --git a/storage/src/tests/distributor/pendingmessagetrackertest.cpp b/storage/src/tests/distributor/pendingmessagetrackertest.cpp
index c83fbbe143b..6f4539d426e 100644
--- a/storage/src/tests/distributor/pendingmessagetrackertest.cpp
+++ b/storage/src/tests/distributor/pendingmessagetrackertest.cpp
@@ -412,7 +412,7 @@ public:
 
     TestChecker() : pri(UINT8_MAX) {}
 
-    bool check(uint32_t msgType, uint16_t node, uint8_t p) {
+    bool check(uint32_t msgType, uint16_t node, uint8_t p) override {
         (void) node;
         if (msgType == api::MessageType::REMOVE_ID) {
             pri = p;
diff --git a/storage/src/tests/distributor/putoperationtest.cpp b/storage/src/tests/distributor/putoperationtest.cpp
index 5c156411e11..83b99460f2c 100644
--- a/storage/src/tests/distributor/putoperationtest.cpp
+++ b/storage/src/tests/distributor/putoperationtest.cpp
@@ -90,7 +90,7 @@ protected:
     void doTestCreationWithBucketActivationDisabled(bool disabled);
 
 public:
-    void setUp() {
+    void setUp() override {
         _repo.reset(
                 new DocumentTypeRepo(*ConfigGetter<DocumenttypesConfig>
                                      ::getConfig("config-doctypes",
@@ -99,7 +99,7 @@ public:
         createLinks();
     };
 
-    void tearDown() {
+    void tearDown() override {
         close();
     }
 
diff --git a/storage/src/tests/distributor/removebucketoperationtest.cpp b/storage/src/tests/distributor/removebucketoperationtest.cpp
index 7cf63a3146f..177f66eaec5 100644
--- a/storage/src/tests/distributor/removebucketoperationtest.cpp
+++ b/storage/src/tests/distributor/removebucketoperationtest.cpp
@@ -26,11 +26,11 @@ protected:
     void testFailWithInvalidBucketInfo();
 
 public:
-    void setUp() {
+    void setUp() override {
         createLinks();
     };
 
-    void tearDown() {
+    void tearDown() override {
         close();
     }
 };
diff --git a/storage/src/tests/distributor/removelocationtest.cpp b/storage/src/tests/distributor/removelocationtest.cpp
index 954bfb6210b..876a01e4a6f 100644
--- a/storage/src/tests/distributor/removelocationtest.cpp
+++ b/storage/src/tests/distributor/removelocationtest.cpp
@@ -24,11 +24,11 @@ protected:
 public:
     std::unique_ptr<RemoveLocationOperation> op;
 
-    void setUp() {
+    void setUp() override {
         createLinks();
     };
 
-    void tearDown() {
+    void tearDown() override {
         close();
     }
 
diff --git a/storage/src/tests/distributor/removeoperationtest.cpp b/storage/src/tests/distributor/removeoperationtest.cpp
index 9d0849962e4..a8f635b19e2 100644
--- a/storage/src/tests/distributor/removeoperationtest.cpp
+++ b/storage/src/tests/distributor/removeoperationtest.cpp
@@ -38,7 +38,7 @@ public:
     document::BucketId bucketId;
     std::unique_ptr<RemoveOperation> op;
 
-    void setUp() {
+    void setUp() override {
         createLinks();
 
         docId = document::DocumentId(document::DocIdString("test", "uri"));
@@ -46,7 +46,7 @@ public:
         _distributor->enableClusterState(lib::ClusterState("distributor:1 storage:4"));
     };
 
-    void tearDown() {
+    void tearDown() override {
         close();
     }
 
diff --git a/storage/src/tests/distributor/simplemaintenancescannertest.cpp b/storage/src/tests/distributor/simplemaintenancescannertest.cpp
index 3486f41149b..100d5582006 100644
--- a/storage/src/tests/distributor/simplemaintenancescannertest.cpp
+++ b/storage/src/tests/distributor/simplemaintenancescannertest.cpp
@@ -51,7 +51,7 @@ public:
     void perNodeMaintenanceStatsAreTracked();
     void testReset();
 
-    void setUp();
+    void setUp() override;
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(SimpleMaintenanceScannerTest);
diff --git a/storage/src/tests/distributor/splitbuckettest.cpp b/storage/src/tests/distributor/splitbuckettest.cpp
index c69af0e038c..de99884b52b 100644
--- a/storage/src/tests/distributor/splitbuckettest.cpp
+++ b/storage/src/tests/distributor/splitbuckettest.cpp
@@ -42,14 +42,14 @@ protected:
 public:
     SplitOperationTest();
 
-    void setUp() {
+    void setUp() override {
         createLinks();
         getConfig().setSplitCount(splitCount);
         getConfig().setSplitSize(splitByteSize);
 
     }
 
-    void tearDown() {
+    void tearDown() override {
         close();
     }
 };
diff --git a/storage/src/tests/distributor/statecheckerstest.cpp b/storage/src/tests/distributor/statecheckerstest.cpp
index f09c93622de..c9ab8a0aa78 100644
--- a/storage/src/tests/distributor/statecheckerstest.cpp
+++ b/storage/src/tests/distributor/statecheckerstest.cpp
@@ -31,11 +31,11 @@ struct StateCheckersTest : public CppUnit::TestFixture,
 {
     StateCheckersTest() {}
 
-    void setUp() {
+    void setUp() override {
         createLinks();
     }
 
-    void tearDown() {
+    void tearDown() override {
         close();
     }
 
diff --git a/storage/src/tests/distributor/statoperationtest.cpp b/storage/src/tests/distributor/statoperationtest.cpp
index f35869cf680..3526e789c96 100644
--- a/storage/src/tests/distributor/statoperationtest.cpp
+++ b/storage/src/tests/distributor/statoperationtest.cpp
@@ -14,11 +14,11 @@ namespace distributor {
 struct StatOperationTest : public CppUnit::TestFixture,
                            public DistributorTestUtil
 {
-    void setUp() {
+    void setUp() override {
         createLinks();
     };
 
-    void tearDown() {
+    void tearDown() override {
         close();
     }
 
diff --git a/storage/src/tests/distributor/statusreporterdelegatetest.cpp b/storage/src/tests/distributor/statusreporterdelegatetest.cpp
index f05eebed0ce..f136b00244a 100644
--- a/storage/src/tests/distributor/statusreporterdelegatetest.cpp
+++ b/storage/src/tests/distributor/statusreporterdelegatetest.cpp
@@ -26,7 +26,7 @@ namespace {
 class MockDelegator : public StatusDelegator
 {
     mutable std::ostringstream _calls;
-    bool handleStatusRequest(const DelegatedStatusRequest& request) const {
+    bool handleStatusRequest(const DelegatedStatusRequest& request) const override {
         _calls << "Request(" << request.path << ")";
         return request.reporter.reportStatus(request.outputStream, request.path);
     }
@@ -43,13 +43,13 @@ public:
         : framework::StatusReporter("foo", "Bar")
     {}
     vespalib::string getReportContentType(
-            const framework::HttpUrlPath&) const
+            const framework::HttpUrlPath&) const override
     {
         return "foo/bar";
     }
 
     bool reportStatus(std::ostream& os,
-                      const framework::HttpUrlPath& path) const
+                      const framework::HttpUrlPath& path) const override
     {
         os << "reportStatus with " << path;
         return true;
diff --git a/storage/src/tests/distributor/throttlingoperationstartertest.cpp b/storage/src/tests/distributor/throttlingoperationstartertest.cpp
index 5c4ba99563c..8e7d98005c1 100644
--- a/storage/src/tests/distributor/throttlingoperationstartertest.cpp
+++ b/storage/src/tests/distributor/throttlingoperationstartertest.cpp
@@ -38,8 +38,8 @@ public:
     void testStartingOperationsFillsUpPendingWindow();
     void testFinishingOperationsAllowsMoreToStart();
 
-    void setUp();
-    void tearDown();
+    void setUp() override;
+    void tearDown() override;
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ThrottlingOperationStarterTest);
diff --git a/storage/src/tests/distributor/twophaseupdateoperationtest.cpp b/storage/src/tests/distributor/twophaseupdateoperationtest.cpp
index 8556f5b5229..fb65e57928e 100644
--- a/storage/src/tests/distributor/twophaseupdateoperationtest.cpp
+++ b/storage/src/tests/distributor/twophaseupdateoperationtest.cpp
@@ -104,7 +104,7 @@ protected:
 
     std::string getUpdatedValueFromLastPut(MessageSenderStub&);
 public:
-    void setUp() {
+    void setUp() override {
         _repo = _testRepo.getTypeRepoSp();
         _doc_type = _repo->getDocumentType("testdoctype1");
         createLinks();
@@ -112,7 +112,7 @@ public:
         getClock().setAbsoluteTimeInSeconds(200);
     }
 
-    void tearDown() {
+    void tearDown() override {
         close();
     }
 
diff --git a/storage/src/tests/distributor/updateoperationtest.cpp b/storage/src/tests/distributor/updateoperationtest.cpp
index 1c47e0a8f05..9c4d1f87fe4 100644
--- a/storage/src/tests/distributor/updateoperationtest.cpp
+++ b/storage/src/tests/distributor/updateoperationtest.cpp
@@ -43,7 +43,7 @@ protected:
     void testMultiNodeInconsistentTimestamp();
 
 public:
-    void setUp() {
+    void setUp() override {
         _repo.reset(
                 new DocumentTypeRepo(*ConfigGetter<DocumenttypesConfig>::
                                      getConfig("config-doctypes",
@@ -52,7 +52,7 @@ public:
         createLinks();
     }
 
-    void tearDown() {
+    void tearDown() override {
         close();
     }
 
diff --git a/storage/src/tests/distributor/visitoroperationtest.cpp b/storage/src/tests/distributor/visitoroperationtest.cpp
index caf326a8720..331a3435485 100644
--- a/storage/src/tests/distributor/visitoroperationtest.cpp
+++ b/storage/src/tests/distributor/visitoroperationtest.cpp
@@ -120,13 +120,13 @@ public:
                         100)
     {}
 
-    void setUp() {
+    void setUp() override {
         createLinks();
         nullId = document::BucketId(0, 0);
         doneId = document::BucketId(INT_MAX);
     };
 
-    void tearDown() {
+    void tearDown() override {
         close();
     }
 
diff --git a/storage/src/tests/frameworkimpl/memory/memorystatusviewertest.cpp b/storage/src/tests/frameworkimpl/memory/memorystatusviewertest.cpp
index 7a03d1c017a..c1e7660323c 100644
--- a/storage/src/tests/frameworkimpl/memory/memorystatusviewertest.cpp
+++ b/storage/src/tests/frameworkimpl/memory/memorystatusviewertest.cpp
@@ -17,7 +17,7 @@ struct MemoryStatusViewerTest : public CppUnit::TestFixture
     std::unique_ptr<TestServiceLayerApp> _node;
     std::unique_ptr<framework::defaultimplementation::MemoryManager> _memMan;
 
-    void setUp();
+    void setUp() override;
 
     void testEmptyState();
     void testSnapshots();
diff --git a/storage/src/tests/frameworkimpl/status/statustest.cpp b/storage/src/tests/frameworkimpl/status/statustest.cpp
index 0fc10e411cb..567f9192d34 100644
--- a/storage/src/tests/frameworkimpl/status/statustest.cpp
+++ b/storage/src/tests/frameworkimpl/status/statustest.cpp
@@ -17,7 +17,7 @@ namespace storage {
 struct StatusTest : public CppUnit::TestFixture {
     std::unique_ptr<TestServiceLayerApp> _node;
 
-    void setUp();
+    void setUp() override;
 
     void testIndexStatusPage();
     void testHtmlStatus();
@@ -51,13 +51,13 @@ namespace {
         }
 
         virtual void reportHtmlHeaderAdditions(
-                std::ostream& out, const framework::HttpUrlPath&) const
+                std::ostream& out, const framework::HttpUrlPath&) const override
         {
             out << _headerAddition;
         }
 
         virtual void reportHtmlStatus(
-                std::ostream& out, const framework::HttpUrlPath&) const
+                std::ostream& out, const framework::HttpUrlPath&) const override
         {
             out << _content;
         }
@@ -68,7 +68,7 @@ namespace {
             : framework::XmlStatusReporter(id, name) {}
         virtual vespalib::string reportXmlStatus(
                 vespalib::xml::XmlOutputStream& xos,
-                const framework::HttpUrlPath&) const
+                const framework::HttpUrlPath&) const override
         {
             xos << vespalib::xml::XmlTag("mytag")
                 << vespalib::xml::XmlAttribute("foo", "bar")
diff --git a/storage/src/tests/persistence/bucketownershipnotifiertest.cpp b/storage/src/tests/persistence/bucketownershipnotifiertest.cpp
index ae54e629473..8553795db71 100644
--- a/storage/src/tests/persistence/bucketownershipnotifiertest.cpp
+++ b/storage/src/tests/persistence/bucketownershipnotifiertest.cpp
@@ -19,7 +19,7 @@ public:
           _clusterState("distributor:2 storage:1")
     {}
 
-    void setUp();
+    void setUp() override;
 
     CPPUNIT_TEST_SUITE(BucketOwnershipNotifierTest);
     CPPUNIT_TEST(testSendNotifyBucketChangeIfOwningDistributorChanged);
diff --git a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
index bf7528c2242..3f21b592b7d 100644
--- a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
+++ b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
@@ -77,8 +77,8 @@ struct FileStorManagerTest : public CppUnit::TestFixture {
 
     FileStorManagerTest() : _node(), _waitTime(LONG_WAITTIME) {}
 
-    void setUp();
-    void tearDown();
+    void setUp() override;
+    void tearDown() override;
 
     void testPut();
     void testHeaderOnlyPut();
@@ -686,7 +686,7 @@ public:
     MessagePusherThread(FileStorHandler& handler, Document::SP doc);
     ~MessagePusherThread();
 
-    void run() {
+    void run() override {
         while (!_done) {
             document::BucketIdFactory factory;
             document::BucketId bucket(16, factory.getBucketId(
@@ -720,7 +720,7 @@ public:
         : _handler(handler), _config(0), _fetchedCount(0), _done(false),
           _failed(false), _threadDone(false) {}
 
-    void run() {
+    void run() override {
         while (!_done) {
             FileStorHandler::LockedMessage msg = _handler.getNextMessage(0, 255);
             if (msg.second.get()) {
@@ -1160,7 +1160,7 @@ public:
     PausedThread(FileStorHandler& handler)
         : _handler(handler), pause(false), done(false), gotoperation(false) {}
 
-    void run() {
+    void run() override {
         FileStorHandler::LockedMessage msg = _handler.getNextMessage(0, 255);
         gotoperation = true;
 
@@ -2364,10 +2364,10 @@ namespace {
             closeNextLink();
         }
 
-        virtual void print(std::ostream& out, bool, const std::string&) const
+        virtual void print(std::ostream& out, bool, const std::string&) const override
             { out << "MidLink"; }
 
-        virtual bool onUp(const std::shared_ptr<api::StorageMessage> & msg) {
+        virtual bool onUp(const std::shared_ptr<api::StorageMessage> & msg) override {
             if (!StorageLinkTest::callOnUp(_up, msg)) _up.sendUp(msg);
             return true;
         }
@@ -2395,10 +2395,10 @@ namespace {
               _leftAddr(leftAddr),
               _rightAddr(rightAddr) {}
 
-        virtual void print(std::ostream& out, bool, const std::string&) const
+        virtual void print(std::ostream& out, bool, const std::string&) const override
             { out << "BinaryStorageLink"; }
 
-        virtual bool onDown(const std::shared_ptr<api::StorageMessage> & msg) {
+        virtual bool onDown(const std::shared_ptr<api::StorageMessage> & msg) override {
 //            LOG(debug, "onDown Received msg: ->%s, %s %llu\n", msg->getAddress() ? msg->getAddress()->toString().c_str() : "(null)", msg->toString().c_str(), msg->getMsgId());
 
             vespalib::LockGuard lock(_lock);
@@ -2432,7 +2432,7 @@ namespace {
             return true;
         }
 
-        virtual bool onUp(const std::shared_ptr<api::StorageMessage> & msg) {            // LOG(debug, "onUp Received msg: ->%s, %s %llu\n", msg->getAddress() ? msg->getAddress()->toString().c_str() : "(null)", msg->toString().c_str(), msg->getMsgId());
+        virtual bool onUp(const std::shared_ptr<api::StorageMessage> & msg) override {            // LOG(debug, "onUp Received msg: ->%s, %s %llu\n", msg->getAddress() ? msg->getAddress()->toString().c_str() : "(null)", msg->toString().c_str(), msg->getMsgId()) override;
 
             vespalib::LockGuard lock(_lock);
             std::set<api::StorageMessage::Id>::iterator it
@@ -2455,17 +2455,17 @@ namespace {
             }
         }
 
-        void onFlush(bool downwards) {
+        void onFlush(bool downwards) override {
             if (downwards) {
                 _left.flush();
                 _right.flush();
             }
         }
-        void onOpen() {
+        void onOpen() override {
             _left.open();
             _right.open();
         }
-        void onClose() {
+        void onClose() override {
             _left.close();
             _right.close();
         }
diff --git a/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp b/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp
index 8d6a8fb8e03..d608bef3307 100644
--- a/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp
+++ b/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp
@@ -45,7 +45,7 @@ struct BucketCheckerInjector : FileStorTestFixture::StorageLinkInjector
         : _node(node),
           _fixture(fixture)
     {}
-    void inject(DummyStorageLink& link) const {
+    void inject(DummyStorageLink& link) const override {
        link.push_back(std::unique_ptr<ModifiedBucketChecker>(
             new ModifiedBucketChecker(_node.getComponentRegister(),
                                       _node.getPersistenceProvider(),
diff --git a/storage/src/tests/persistence/filestorage/modifiedbucketcheckertest.cpp b/storage/src/tests/persistence/filestorage/modifiedbucketcheckertest.cpp
index 848799fde95..2dc60594c45 100644
--- a/storage/src/tests/persistence/filestorage/modifiedbucketcheckertest.cpp
+++ b/storage/src/tests/persistence/filestorage/modifiedbucketcheckertest.cpp
@@ -19,8 +19,8 @@ public:
         MESSAGE_WAIT_TIME = 60*2
     };
 
-    void setUp();
-    void tearDown();
+    void setUp() override;
+    void tearDown() override;
 
     void testModifiedBucketThreadSendsRecheckBucketCommands();
     void testDoNotCheckModifiedBucketsIfAlreadyPending();
diff --git a/storage/src/tests/persistence/filestorage/operationabortingtest.cpp b/storage/src/tests/persistence/filestorage/operationabortingtest.cpp
index 6dce437033d..a661c5c445e 100644
--- a/storage/src/tests/persistence/filestorage/operationabortingtest.cpp
+++ b/storage/src/tests/persistence/filestorage/operationabortingtest.cpp
@@ -275,7 +275,7 @@ public:
           _downLink(downLink)
     {}
 
-    void run() {
+    void run() override {
         // Best-effort synchronized starting
         _queueBarrier.await();
         _downLink.sendDown(_abortCmd);
diff --git a/storage/src/tests/persistence/legacyoperationhandlertest.cpp b/storage/src/tests/persistence/legacyoperationhandlertest.cpp
index ca496f4a260..df262501299 100644
--- a/storage/src/tests/persistence/legacyoperationhandlertest.cpp
+++ b/storage/src/tests/persistence/legacyoperationhandlertest.cpp
@@ -27,7 +27,7 @@ class LegacyOperationHandlerTest : public SingleDiskPersistenceTestUtils
     CPPUNIT_TEST_SUITE_END();
 
 public:
-    void setUp() {
+    void setUp() override {
         SingleDiskPersistenceTestUtils::setUp();
         createBucket(document::BucketId(16, 4));
         spi::Context context(spi::LoadType(0, "default"), spi::Priority(0),
diff --git a/storage/src/tests/persistence/mergehandlertest.cpp b/storage/src/tests/persistence/mergehandlertest.cpp
index 87db1f09bd3..8147992a516 100644
--- a/storage/src/tests/persistence/mergehandlertest.cpp
+++ b/storage/src/tests/persistence/mergehandlertest.cpp
@@ -28,7 +28,7 @@ struct MergeHandlerTest : public SingleDiskPersistenceTestUtils
     template <typename T>
     std::shared_ptr<T> fetchSingleMessage();
 
-    void setUp();
+    void setUp() override;
 
     enum ChainPos { FRONT, MIDDLE, BACK };
     void setUpChain(ChainPos);
@@ -129,7 +129,7 @@ private:
         : public HandlerInvoker
     {
     public:
-        std::string afterInvoke(MergeHandlerTest&, MergeHandler&);
+        std::string afterInvoke(MergeHandlerTest&, MergeHandler&) override;
     };
 
     template <typename ExpectedMessage>
@@ -139,21 +139,21 @@ private:
         : public NoReplyHandlerInvoker
     {
     public:
-        void invoke(MergeHandlerTest&, MergeHandler&, spi::Context&);
+        void invoke(MergeHandlerTest&, MergeHandler&, spi::Context&) override;
     };
 
     class HandleMergeBucketReplyInvoker
         : public NoReplyHandlerInvoker
     {
     public:
-        void invoke(MergeHandlerTest&, MergeHandler&, spi::Context&);
+        void invoke(MergeHandlerTest&, MergeHandler&, spi::Context&) override;
     };
 
     class HandleGetBucketDiffInvoker
         : public NoReplyHandlerInvoker
     {
     public:
-        void invoke(MergeHandlerTest&, MergeHandler&, spi::Context&);
+        void invoke(MergeHandlerTest&, MergeHandler&, spi::Context&) override;
     };
 
     class MultiPositionHandlerInvoker
@@ -176,9 +176,9 @@ private:
     public:
         HandleGetBucketDiffReplyInvoker();
         ~HandleGetBucketDiffReplyInvoker();
-        void beforeInvoke(MergeHandlerTest&, MergeHandler&, spi::Context&);
-        void invoke(MergeHandlerTest&, MergeHandler&, spi::Context&);
-        std::string afterInvoke(MergeHandlerTest&, MergeHandler&);
+        void beforeInvoke(MergeHandlerTest&, MergeHandler&, spi::Context&) override;
+        void invoke(MergeHandlerTest&, MergeHandler&, spi::Context&) override;
+        std::string afterInvoke(MergeHandlerTest&, MergeHandler&) override;
     private:
         MessageSenderStub _stub;
         std::shared_ptr<api::GetBucketDiffCommand> _diffCmd;
@@ -189,7 +189,7 @@ private:
     {
     public:
         HandleApplyBucketDiffInvoker() : _counter(0) {}
-        void invoke(MergeHandlerTest&, MergeHandler&, spi::Context&);
+        void invoke(MergeHandlerTest&, MergeHandler&, spi::Context&) override;
     private:
         int _counter;
     };
@@ -200,9 +200,9 @@ private:
     public:
         HandleApplyBucketDiffReplyInvoker();
         ~HandleApplyBucketDiffReplyInvoker();
-        void beforeInvoke(MergeHandlerTest&, MergeHandler&, spi::Context&);
-        void invoke(MergeHandlerTest&, MergeHandler&, spi::Context&);
-        std::string afterInvoke(MergeHandlerTest&, MergeHandler&);
+        void beforeInvoke(MergeHandlerTest&, MergeHandler&, spi::Context&) override;
+        void invoke(MergeHandlerTest&, MergeHandler&, spi::Context&) override;
+        std::string afterInvoke(MergeHandlerTest&, MergeHandler&) override;
     private:
         int _counter;
         MessageSenderStub _stub;
diff --git a/storage/src/tests/persistence/providershutdownwrappertest.cpp b/storage/src/tests/persistence/providershutdownwrappertest.cpp
index 1d2bf08e0c4..8b1ef88aa2c 100644
--- a/storage/src/tests/persistence/providershutdownwrappertest.cpp
+++ b/storage/src/tests/persistence/providershutdownwrappertest.cpp
@@ -28,7 +28,7 @@ class TestShutdownListener
 public:
     TestShutdownListener() : _reason() {}
 
-    void requestShutdown(vespalib::stringref reason) {
+    void requestShutdown(vespalib::stringref reason) override {
         _reason = reason;
     }
 
diff --git a/storage/src/tests/storageserver/bouncertest.cpp b/storage/src/tests/storageserver/bouncertest.cpp
index f00e4b19c31..e5b9a3e6092 100644
--- a/storage/src/tests/storageserver/bouncertest.cpp
+++ b/storage/src/tests/storageserver/bouncertest.cpp
@@ -25,8 +25,8 @@ struct BouncerTest : public CppUnit::TestFixture {
 
     BouncerTest();
 
-    void setUp();
-    void tearDown();
+    void setUp() override;
+    void tearDown() override;
 
     void testFutureTimestamp();
     void testAllowNotifyBucketChangeEvenWhenDistributorDown();
diff --git a/storage/src/tests/storageserver/bucketintegritycheckertest.cpp b/storage/src/tests/storageserver/bucketintegritycheckertest.cpp
index 88a5546b174..d9a175f3b04 100644
--- a/storage/src/tests/storageserver/bucketintegritycheckertest.cpp
+++ b/storage/src/tests/storageserver/bucketintegritycheckertest.cpp
@@ -25,7 +25,7 @@ struct BucketIntegrityCheckerTest : public CppUnit::TestFixture {
     std::unique_ptr<TestServiceLayerApp> _node;
     int _timeout; // Timeout in seconds before aborting
 
-    void setUp() {
+    void setUp() override {
         _timeout = 60*2;
         _config.reset(new vdstestlib::DirConfig(getStandardConfig(true)));
         _node.reset(new TestServiceLayerApp(DiskCount(256),
@@ -33,7 +33,7 @@ struct BucketIntegrityCheckerTest : public CppUnit::TestFixture {
                                             _config->getConfigId()));
     }
 
-    void tearDown() {
+    void tearDown() override {
         LOG(info, "Finished test");
     }
 
diff --git a/storage/src/tests/storageserver/changedbucketownershiphandlertest.cpp b/storage/src/tests/storageserver/changedbucketownershiphandlertest.cpp
index 3b83d71d8f3..8eb6b74a840 100644
--- a/storage/src/tests/storageserver/changedbucketownershiphandlertest.cpp
+++ b/storage/src/tests/storageserver/changedbucketownershiphandlertest.cpp
@@ -119,7 +119,7 @@ public:
     void testExternalLoadOpAbortUpdatesMetric();
     void testExternalLoadOpAbortsAreConfigurable();
 
-    void setUp();
+    void setUp() override;
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ChangedBucketOwnershipHandlerTest);
diff --git a/storage/src/tests/storageserver/documentapiconvertertest.cpp b/storage/src/tests/storageserver/documentapiconvertertest.cpp
index 5c5c5627feb..1f1198efc3c 100644
--- a/storage/src/tests/storageserver/documentapiconvertertest.cpp
+++ b/storage/src/tests/storageserver/documentapiconvertertest.cpp
@@ -34,7 +34,7 @@ struct DocumentApiConverterTest : public CppUnit::TestFixture
     {
     }
 
-    void setUp() {
+    void setUp() override {
         _converter.reset(new DocumentApiConverter("raw:"));
     };
 
diff --git a/storage/src/tests/storageserver/mergethrottlertest.cpp b/storage/src/tests/storageserver/mergethrottlertest.cpp
index a5e637146fc..8a01acd6a68 100644
--- a/storage/src/tests/storageserver/mergethrottlertest.cpp
+++ b/storage/src/tests/storageserver/mergethrottlertest.cpp
@@ -135,8 +135,8 @@ class MergeThrottlerTest : public CppUnit::TestFixture
     CPPUNIT_TEST(testNewClusterStateAbortsAllOutdatedActiveMerges);
     CPPUNIT_TEST_SUITE_END();
 public:
-    void setUp();
-    void tearDown();
+    void setUp() override;
+    void tearDown() override;
 
     void testMergesConfig();
     void testChain();
diff --git a/storage/src/tests/storageserver/priorityconvertertest.cpp b/storage/src/tests/storageserver/priorityconvertertest.cpp
index ecbdcfb6b91..ecbbd25b8b1 100644
--- a/storage/src/tests/storageserver/priorityconvertertest.cpp
+++ b/storage/src/tests/storageserver/priorityconvertertest.cpp
@@ -11,7 +11,7 @@ struct PriorityConverterTest : public CppUnit::TestFixture
 {
     std::unique_ptr<PriorityConverter> _converter;
 
-    void setUp() {
+    void setUp() override {
         vdstestlib::DirConfig config(getStandardConfig(true));
         _converter.reset(new PriorityConverter(config.getConfigId()));
     };
diff --git a/storage/src/tests/storageserver/statemanagertest.cpp b/storage/src/tests/storageserver/statemanagertest.cpp
index 83fad3a7484..4244ce0c4ce 100644
--- a/storage/src/tests/storageserver/statemanagertest.cpp
+++ b/storage/src/tests/storageserver/statemanagertest.cpp
@@ -31,8 +31,8 @@ struct StateManagerTest : public CppUnit::TestFixture {
 
     StateManagerTest();
 
-    void setUp();
-    void tearDown();
+    void setUp() override;
+    void tearDown() override;
 
     void testSystemState();
     void testReportedNodeState();
@@ -138,7 +138,7 @@ namespace {
         MyStateListener(const NodeStateUpdater& upd)
             : updater(upd), current(*updater.getReportedNodeState()) {}
 
-        void handleNewState()
+        void handleNewState() override
         {
             ost << current << " -> ";
             current = *updater.getReportedNodeState();
diff --git a/storage/src/tests/storageserver/statereportertest.cpp b/storage/src/tests/storageserver/statereportertest.cpp
index 87686f06d6c..265b9e95d83 100644
--- a/storage/src/tests/storageserver/statereportertest.cpp
+++ b/storage/src/tests/storageserver/statereportertest.cpp
@@ -18,8 +18,8 @@ namespace storage {
 
 class DummyApplicationGenerationFether : public ApplicationGenerationFetcher {
 public:
-    virtual int64_t getGeneration() const { return 1; }
-    virtual std::string getComponentName() const { return "component"; }
+    virtual int64_t getGeneration() const override { return 1; }
+    virtual std::string getComponentName() const override { return "component"; }
 };
 
 struct StateReporterTest : public CppUnit::TestFixture {
@@ -36,8 +36,8 @@ struct StateReporterTest : public CppUnit::TestFixture {
 
     StateReporterTest();
 
-    void setUp();
-    void tearDown();
+    void setUp() override;
+    void tearDown() override;
     void runLoad(uint32_t count = 1);
 
     void testReportConfigGeneration();
@@ -58,9 +58,9 @@ namespace {
     {
         framework::Clock& _clock;
         MetricClock(framework::Clock& c) : _clock(c) {}
-        virtual time_t getTime() const
+        virtual time_t getTime() const override
             { return _clock.getTimeInSeconds().getTime(); }
-        virtual time_t getTimeInMilliSecs() const
+        virtual time_t getTimeInMilliSecs() const override
             { return _clock.getTimeInMillis().getTime(); }
     };
 }
diff --git a/storage/src/tests/storageutil/charttest.cpp b/storage/src/tests/storageutil/charttest.cpp
index d9ce3d6f1b4..4f83a9f26f4 100644
--- a/storage/src/tests/storageutil/charttest.cpp
+++ b/storage/src/tests/storageutil/charttest.cpp
@@ -10,8 +10,8 @@ namespace storage {
 
 struct PieChartTest : public CppUnit::TestFixture
 {
-    void setUp() {}
-    void tearDown() {}
+    void setUp() override {}
+    void tearDown() override {}
 
     void testWriteHtmlFile();
 
diff --git a/storage/src/tests/storageutil/palettetest.cpp b/storage/src/tests/storageutil/palettetest.cpp
index ffc2dd091ee..e5a4e73d58a 100644
--- a/storage/src/tests/storageutil/palettetest.cpp
+++ b/storage/src/tests/storageutil/palettetest.cpp
@@ -7,8 +7,8 @@
 namespace storage {
 
 struct PaletteTest : public CppUnit::TestFixture {
-    void setUp() {}
-    void tearDown() {}
+    void setUp() override {}
+    void tearDown() override {}
 
     void testNormalUsage();
 
diff --git a/storage/src/tests/visiting/visitormanagertest.cpp b/storage/src/tests/visiting/visitormanagertest.cpp
index f83ac825aa4..8aa57b982db 100644
--- a/storage/src/tests/visiting/visitormanagertest.cpp
+++ b/storage/src/tests/visiting/visitormanagertest.cpp
@@ -70,7 +70,7 @@ public:
         // Not using setUp since can't throw exception out of it.
     void initializeTest();
     void addSomeRemoves(bool removeAll = false);
-    void tearDown();
+    void tearDown() override;
     TestVisitorMessageSession& getSession(uint32_t n);
     uint64_t verifyCreateVisitorReply(
             api::ReturnCode::Result expectedResult,
diff --git a/storage/src/tests/visiting/visitortest.cpp b/storage/src/tests/visiting/visitortest.cpp
index 1e2eda75cc8..e6a3542cbf2 100644
--- a/storage/src/tests/visiting/visitortest.cpp
+++ b/storage/src/tests/visiting/visitortest.cpp
@@ -127,7 +127,7 @@ public:
 
     std::shared_ptr<api::CreateVisitorCommand> makeCreateVisitor(
             const VisitorOptions& options = VisitorOptions());
-    void tearDown();
+    void tearDown() override;
     bool waitUntilNoActiveVisitors();
     TestVisitorMessageSession& getSession(uint32_t n);
     uint64_t verifyCreateVisitorReply(