diff --git a/libwvdrmengine/cdm/core/include/policy_timers_v15.h b/libwvdrmengine/cdm/core/include/policy_timers_v15.h
index ed3ca71a..a9f42c2d 100644
--- a/libwvdrmengine/cdm/core/include/policy_timers_v15.h
+++ b/libwvdrmengine/cdm/core/include/policy_timers_v15.h
@@ -29,7 +29,7 @@ class PolicyTimersV15 : public PolicyTimers {
  public:
   PolicyTimersV15() : grace_period_end_time_(0) {}
 
-  virtual ~PolicyTimersV15() {}
+  ~PolicyTimersV15() override {}
 
   // UpdateLicense is used in handling a license response, a renewal response,
   // or when restoring or releasing a persistent license.
diff --git a/libwvdrmengine/cdm/core/include/policy_timers_v16.h b/libwvdrmengine/cdm/core/include/policy_timers_v16.h
index 6efa7c69..2e0c472d 100644
--- a/libwvdrmengine/cdm/core/include/policy_timers_v16.h
+++ b/libwvdrmengine/cdm/core/include/policy_timers_v16.h
@@ -26,7 +26,7 @@ class PolicyTimersV16 : public PolicyTimers {
  public:
   PolicyTimersV16() {}
 
-  virtual ~PolicyTimersV16() {}
+  ~PolicyTimersV16() override {}
 
   // UpdateLicense is used in handling a license response, a renewal response,
   // or when restoring or releasing a persistent license.
diff --git a/libwvdrmengine/cdm/core/test/certificate_provisioning_unittest.cpp b/libwvdrmengine/cdm/core/test/certificate_provisioning_unittest.cpp
index 4ba4c3e1..3be65f51 100644
--- a/libwvdrmengine/cdm/core/test/certificate_provisioning_unittest.cpp
+++ b/libwvdrmengine/cdm/core/test/certificate_provisioning_unittest.cpp
@@ -76,7 +76,8 @@ class MockCryptoSession : public TestCryptoSession {
 };
 
 class TestStubCryptoSessionFactory : public CryptoSessionFactory {
-  CryptoSession* MakeCryptoSession(metrics::CryptoMetrics* crypto_metrics) {
+  CryptoSession* MakeCryptoSession(
+      metrics::CryptoMetrics* crypto_metrics) override {
     return new MockCryptoSession(crypto_metrics);
   }
 };
diff --git a/libwvdrmengine/cdm/core/test/crypto_session_unittest.cpp b/libwvdrmengine/cdm/core/test/crypto_session_unittest.cpp
index 324b97e7..0ed24b84 100644
--- a/libwvdrmengine/cdm/core/test/crypto_session_unittest.cpp
+++ b/libwvdrmengine/cdm/core/test/crypto_session_unittest.cpp
@@ -252,7 +252,7 @@ class CryptoSessionForTest : public TestCryptoSession, public WvCdmTestBase {
   using CryptoSession::ExtractSystemIdFromOemCert;
   CryptoSessionForTest() : TestCryptoSession(metrics_.GetCryptoMetrics()) {}
 
-  void SetUp() {}
+  void SetUp() override {}
 
   KeySession* key_session() { return key_session_.get(); }
 
diff --git a/libwvdrmengine/cdm/core/test/device_files_unittest.cpp b/libwvdrmengine/cdm/core/test/device_files_unittest.cpp
index 7a1376ce..2d16ac54 100644
--- a/libwvdrmengine/cdm/core/test/device_files_unittest.cpp
+++ b/libwvdrmengine/cdm/core/test/device_files_unittest.cpp
@@ -3745,7 +3745,7 @@ const std::vector<std::string> kHashedUsageInfoFileKeySetList = {
 class MockFile : public File {
  public:
   MockFile() {}
-  ~MockFile() {}
+  ~MockFile() override {}
 
   MOCK_METHOD2(Read, ssize_t(char*, size_t));
   MOCK_METHOD2(Write, ssize_t(const char*, size_t));
@@ -3754,7 +3754,7 @@ class MockFile : public File {
 class MockFileSystem : public FileSystem {
  public:
   MockFileSystem() {}
-  ~MockFileSystem() {}
+  ~MockFileSystem() override {}
 
   MOCK_METHOD2(Open, std::unique_ptr<File>(const std::string&, int flags));
   MOCK_METHOD0(IsFactoryReset, bool());
diff --git a/libwvdrmengine/cdm/core/test/ota_keybox_provisioner_test.cpp b/libwvdrmengine/cdm/core/test/ota_keybox_provisioner_test.cpp
index daaab941..a102619b 100644
--- a/libwvdrmengine/cdm/core/test/ota_keybox_provisioner_test.cpp
+++ b/libwvdrmengine/cdm/core/test/ota_keybox_provisioner_test.cpp
@@ -47,7 +47,7 @@ const std::string kAnotherFakeOtaProvisioningResponse =
 class MockCryptoSession : public CryptoSession {
  public:
   MockCryptoSession() : CryptoSession(&crypto_metrics_) {}
-  ~MockCryptoSession() {}
+  ~MockCryptoSession() override {}
 
   bool IsOpen() override { return is_open_; }
   void SetIsOpen(bool is_open) { is_open_ = is_open; }
diff --git a/libwvdrmengine/cdm/core/test/service_certificate_unittest.cpp b/libwvdrmengine/cdm/core/test/service_certificate_unittest.cpp
index dd70537c..a7249a67 100644
--- a/libwvdrmengine/cdm/core/test/service_certificate_unittest.cpp
+++ b/libwvdrmengine/cdm/core/test/service_certificate_unittest.cpp
@@ -79,7 +79,7 @@ class StubCdmClientPropertySet : public CdmClientPropertySet {
   }
 
   uint32_t session_sharing_id() const override { return session_sharing_id_; }
-  virtual bool use_atsc_mode() const { return false; }
+  bool use_atsc_mode() const override { return false; }
 
   void set_session_sharing_id(uint32_t id) override {
     session_sharing_id_ = id;
diff --git a/libwvdrmengine/cdm/core/test/test_base.cpp b/libwvdrmengine/cdm/core/test/test_base.cpp
index 1a487f08..6de0fe2c 100644
--- a/libwvdrmengine/cdm/core/test/test_base.cpp
+++ b/libwvdrmengine/cdm/core/test/test_base.cpp
@@ -248,7 +248,8 @@ CdmResponseType TestCryptoSession::GenerateNonce(uint32_t* nonce) {
 }
 
 class TestCryptoSessionFactory : public CryptoSessionFactory {
-  CryptoSession* MakeCryptoSession(metrics::CryptoMetrics* crypto_metrics) {
+  CryptoSession* MakeCryptoSession(
+      metrics::CryptoMetrics* crypto_metrics) override {
     // We need to add extra locking here because we need to make sure that there
     // are no other OEMCrypto calls between OEMCrypto_Initialize and
     // InstallTestRootOfTrust.  OEMCrypto_Initialize is called in the production
diff --git a/libwvdrmengine/cdm/core/test/test_base.h b/libwvdrmengine/cdm/core/test/test_base.h
index 58cea6c9..f98b8e37 100644
--- a/libwvdrmengine/cdm/core/test/test_base.h
+++ b/libwvdrmengine/cdm/core/test/test_base.h
@@ -105,7 +105,7 @@ class TestCryptoSession : public CryptoSession {
   explicit TestCryptoSession(metrics::CryptoMetrics* crypto_metrics);
   // This intercepts nonce flood errors, which is useful for tests that request
   // many nonces and are not time critical.
-  CdmResponseType GenerateNonce(uint32_t* nonce);
+  CdmResponseType GenerateNonce(uint32_t* nonce) override;
 };
 
 // A holder for a license.  Users of this class will first open a session with
diff --git a/libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp b/libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp
index 0c8994ea..304c46cb 100644
--- a/libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp
+++ b/libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp
@@ -445,8 +445,8 @@ class MockCryptoSession : public TestCryptoSession {
 
   // Fake method for testing.  Having an EXPECT_CALL causes complexities
   // for getting table capacity during initialization.
-  virtual bool GetMaximumUsageTableEntries(SecurityLevel /*security_level*/,
-                                           size_t* number_of_entries) {
+  bool GetMaximumUsageTableEntries(SecurityLevel /*security_level*/,
+                                   size_t* number_of_entries) override {
     if (number_of_entries == nullptr || !maximum_usage_table_entries_set_)
       return false;
     *number_of_entries = maximum_usage_table_entries_;
diff --git a/libwvdrmengine/cdm/metrics/test/event_metric_unittest.cpp b/libwvdrmengine/cdm/metrics/test/event_metric_unittest.cpp
index 7e2b978f..bb51037f 100644
--- a/libwvdrmengine/cdm/metrics/test/event_metric_unittest.cpp
+++ b/libwvdrmengine/cdm/metrics/test/event_metric_unittest.cpp
@@ -16,7 +16,7 @@ using drm_metrics::TestMetrics;
 
 class EventMetricTest : public ::testing::Test {
  public:
-  void SetUp() {}
+  void SetUp() override {}
 
  protected:
 };