5 files changed, 6 insertions, 9 deletions

diff --git a/src/tests/test_pkcs11_high_level.cpp b/src/tests/test_pkcs11_high_level.cpp
index 5ff092a74..5944a2b1d 100644
--- a/src/tests/test_pkcs11_high_level.cpp
+++ b/src/tests/test_pkcs11_high_level.cpp
@@ -80,9 +80,6 @@ class TestSession
             m_session->login(UserType::User, PIN_SECVEC);
             }
          }
-
-      inline Module& module() const { return *m_module; }
-      inline Slot& slot() const { return *m_slot; }
       inline Session& session() const { return *m_session; }
 
    private:
diff --git a/src/tests/test_rng.cpp b/src/tests/test_rng.cpp
index 0ebc091e2..c905b09e3 100644
--- a/src/tests/test_rng.cpp
+++ b/src/tests/test_rng.cpp
@@ -105,7 +105,7 @@ class HMAC_DRBG_Unit_Tests : public Test
       class Request_Counting_RNG : public Botan::RandomNumberGenerator
          {
          public:
-            Request_Counting_RNG() : m_randomize_count(0) {};
+            Request_Counting_RNG() : m_randomize_count(0) {}
 
             bool is_seeded() const override { return true; }
 
diff --git a/src/tests/test_rng.h b/src/tests/test_rng.h
index 90ade91c4..9086aaf12 100644
--- a/src/tests/test_rng.h
+++ b/src/tests/test_rng.h
@@ -53,7 +53,7 @@ class Fixed_Output_RNG : public Botan::RandomNumberGenerator
 
       std::string name() const override { return "Fixed_Output_RNG"; }
 
-      void clear() throw() override {}
+      void clear() BOTAN_NOEXCEPT override {}
 
       explicit Fixed_Output_RNG(const std::vector<uint8_t>& in)
          {
@@ -66,7 +66,7 @@ class Fixed_Output_RNG : public Botan::RandomNumberGenerator
          m_buf.insert(m_buf.end(), in.begin(), in.end());
          }
 
-      Fixed_Output_RNG() {}
+      Fixed_Output_RNG() = default;
    protected:
       size_t remaining() const { return m_buf.size(); }
 
diff --git a/src/tests/tests.h b/src/tests/tests.h
index 81243be58..f90e0037b 100644
--- a/src/tests/tests.h
+++ b/src/tests/tests.h
@@ -298,7 +298,7 @@ class Test
                }
 
             bool test_throws(const std::string& what, std::function<void ()> fn);
-            
+
             bool test_throws(const std::string& what, const std::string& expected,
                               std::function<void ()> fn);
 
@@ -323,7 +323,7 @@ class Test
          };
 
       virtual std::vector<Test::Result> run() = 0;
-      virtual ~Test() {}
+      virtual ~Test() = default;
 
       static std::vector<Test::Result> run_test(const std::string& what, bool fail_if_missing);
 
diff --git a/src/tests/unit_x509.cpp b/src/tests/unit_x509.cpp
index e23017738..5f11523b5 100644
--- a/src/tests/unit_x509.cpp
+++ b/src/tests/unit_x509.cpp
@@ -801,7 +801,7 @@ Test::Result test_valid_constraints(const std::string& pk_algo)
 class String_Extension : public Botan::Certificate_Extension
    {
    public:
-      String_Extension() : m_contents() {}
+      String_Extension() = default;
       String_Extension(const std::string& val) : m_contents(val) {}
 
       std::string value() const { return m_contents; }