diff --git a/test/base.hpp b/test/base.hpp
index 96c1d4f..4e5aac2 100644
--- a/test/base.hpp
+++ b/test/base.hpp
@@ -42,7 +42,7 @@ static constexpr size_t STRESS_TEST_NUM_THREADS = 500;
 class Base
 {
 public:
-  virtual ~Base() {}
+  virtual ~Base() = default;
   virtual void saySomething() = 0;
 };
 
diff --git a/test/fviz_case_study/fviz_default_plugin.cpp b/test/fviz_case_study/fviz_default_plugin.cpp
index 98937a4..2dbe688 100644
--- a/test/fviz_case_study/fviz_default_plugin.cpp
+++ b/test/fviz_case_study/fviz_default_plugin.cpp
@@ -20,8 +20,8 @@
 class Bar : public FvizPluginBase
 {
 public:
-  virtual ~Bar() = default;
-  void speak()
+  ~Bar() override = default;
+  void speak() override
   {
     foo("from plugin Bar");
   }
@@ -30,8 +30,8 @@ class Bar : public FvizPluginBase
 class Baz : public FvizPluginBase
 {
 public:
-  virtual ~Baz() = default;
-  void speak()
+  ~Baz() override = default;
+  void speak() override
   {
     foo("from plugin Baz");
   }
diff --git a/test/fviz_case_study/fviz_plugin_base.hpp b/test/fviz_case_study/fviz_plugin_base.hpp
index eee524c..f72962d 100644
--- a/test/fviz_case_study/fviz_plugin_base.hpp
+++ b/test/fviz_case_study/fviz_plugin_base.hpp
@@ -18,7 +18,7 @@
 class FvizPluginBase
 {
 public:
-  virtual ~FvizPluginBase() {}
+  virtual ~FvizPluginBase() = default;
   virtual void speak() = 0;
 };
 
diff --git a/test/global_plugins.cpp b/test/global_plugins.cpp
index 47cdd60..3c9865d 100644
--- a/test/global_plugins.cpp
+++ b/test/global_plugins.cpp
@@ -39,7 +39,7 @@
 class Kangaroo : public Base
 {
 public:
-  void saySomething()
+  void saySomething() override
   {
     printf("[Angry growl]\n");
   }
@@ -48,7 +48,7 @@ class Kangaroo : public Base
 class Panda : public Base
 {
 public:
-  void saySomething()
+  void saySomething() override
   {
     printf("[Excited squeaks!!!]\n");
   }
@@ -57,7 +57,7 @@ class Panda : public Base
 class Hyena : public Base
 {
 public:
-  void saySomething()
+  void saySomething() override
   {
     printf("[Cackling laugh]\n");
   }
@@ -66,7 +66,7 @@ class Hyena : public Base
 class Alpaca : public Base
 {
 public:
-  void saySomething()
+  void saySomething() override
   {
     printf("hhhaaaaaaaaaa\n");
   }
diff --git a/test/plugins1.cpp b/test/plugins1.cpp
index 7856dbf..5d4872d 100644
--- a/test/plugins1.cpp
+++ b/test/plugins1.cpp
@@ -36,7 +36,7 @@
 class Dog : public Base
 {
 public:
-  void saySomething()
+  void saySomething() override
   {
     printf("Bark\n");
   }
@@ -45,7 +45,7 @@ class Dog : public Base
 class Cat : public Base
 {
 public:
-  void saySomething()
+  void saySomething() override
   {
     printf("Meow\n");
   }
@@ -54,7 +54,7 @@ class Cat : public Base
 class Duck : public Base
 {
 public:
-  void saySomething()
+  void saySomething() override
   {
     printf("Quack\n");
   }
@@ -63,7 +63,7 @@ class Duck : public Base
 class Cow : public Base
 {
 public:
-  void saySomething()
+  void saySomething() override
   {
     printf("Moooo\n");
   }
@@ -72,7 +72,7 @@ class Cow : public Base
 class Sheep : public Base
 {
 public:
-  void saySomething()
+  void saySomething() override
   {
     printf("Baaah\n");
   }
diff --git a/test/plugins2.cpp b/test/plugins2.cpp
index 162f6e2..40a66f2 100644
--- a/test/plugins2.cpp
+++ b/test/plugins2.cpp
@@ -36,7 +36,7 @@
 class Robot : public Base
 {
 public:
-  void saySomething()
+  void saySomething() override
   {
     printf("Beep boop\n");
   }
@@ -45,7 +45,7 @@ class Robot : public Base
 class Alien : public Base
 {
 public:
-  void saySomething()
+  void saySomething() override
   {
     printf("Znornoff!!!\n");
   }
@@ -54,7 +54,7 @@ class Alien : public Base
 class Monster : public Base
 {
 public:
-  void saySomething()
+  void saySomething() override
   {
     printf("BEAAAHHHH\n");
   }
@@ -63,7 +63,7 @@ class Monster : public Base
 class Zombie : public Base
 {
 public:
-  void saySomething()
+  void saySomething() override
   {
     printf("Brains!!!\n");
   }
diff --git a/test/unique_ptr_test.cpp b/test/unique_ptr_test.cpp
index 9b133ca..eb9f8a1 100644
--- a/test/unique_ptr_test.cpp
+++ b/test/unique_ptr_test.cpp
@@ -295,7 +295,7 @@ TEST(MultiClassLoaderUniquePtrTest, nonLazyLoad) {
 }
 TEST(MultiClassLoaderUniquePtrTest, noWarningOnLazyLoad) {
   try {
-    ClassLoader::UniquePtr<Base> cat = nullptr, dog = nullptr, rob = nullptr;
+    ClassLoader::UniquePtr<Base> cat, dog, rob;
     {
       class_loader::MultiLibraryClassLoader loader(true);
       loader.loadLibrary(LIBRARY_1);