diff --git a/.clang-tidy b/.clang-tidy
index 13fcacb..b0973f4 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -195,6 +195,29 @@
 clang-analyzer-valist.ValistBase,
 clang-analyzer-webkit.NoUncountedMemberChecker,
 clang-analyzer-webkit.RefCntblBaseVirtualDtor,
+modernize-avoid-bind,
+modernize-deprecated-headers,
+modernize-deprecated-ios-base-aliases,
+modernize-loop-convert,
+modernize-make-shared,
+modernize-make-unique,
+modernize-raw-string-literal,
+modernize-replace-auto-ptr,
+modernize-replace-random-shuffle,
+modernize-return-braced-init-list,
+modernize-shrink-to-fit,
+modernize-unary-static-assert,
+modernize-use-bool-literals,
+modernize-use-default-member-init,
+modernize-use-emplace,
+modernize-use-equals-default,
+modernize-use-equals-delete,
+modernize-use-noexcept,
+modernize-use-nullptr,
+modernize-use-override,
+modernize-use-transparent-functors,
+modernize-use-uncaught-exceptions,
+modernize-use-using,
 performance-faster-string-find,
 performance-for-range-copy,
 performance-implicit-conversion-in-loop,
diff --git a/bmc_epoch.hpp b/bmc_epoch.hpp
index fd5e3f4..e4047f0 100644
--- a/bmc_epoch.hpp
+++ b/bmc_epoch.hpp
@@ -32,7 +32,7 @@
         initialize();
     }
 
-    ~BmcEpoch();
+    ~BmcEpoch() override;
 
     /** @brief Notified on time mode changed */
     void onModeChanged(Mode mode) override;
diff --git a/manager.cpp b/manager.cpp
index 36285ff..1aeaf4b 100644
--- a/manager.cpp
+++ b/manager.cpp
@@ -2,10 +2,10 @@
 
 #include "utils.hpp"
 
-#include <assert.h>
-
 #include <phosphor-logging/lg2.hpp>
 
+#include <cassert>
+
 namespace rules = sdbusplus::bus::match::rules;
 
 namespace // anonymous
diff --git a/property_change_listener.hpp b/property_change_listener.hpp
index 6439d3e..e6fdcde 100644
--- a/property_change_listener.hpp
+++ b/property_change_listener.hpp
@@ -10,8 +10,7 @@
 class PropertyChangeListner
 {
   public:
-    virtual ~PropertyChangeListner()
-    {}
+    virtual ~PropertyChangeListner() = default;
 
     /** @brief Notified on time mode is changed */
     virtual void onModeChanged(Mode mode) = 0;
diff --git a/test/TestBmcEpoch.cpp b/test/TestBmcEpoch.cpp
index 8556d72..4d9c814 100644
--- a/test/TestBmcEpoch.cpp
+++ b/test/TestBmcEpoch.cpp
@@ -29,7 +29,7 @@
         bmcEpoch = std::make_unique<BmcEpoch>(bus, objpathBmc, manager);
     }
 
-    ~TestBmcEpoch()
+    ~TestBmcEpoch() override
     {
         bus.detach_event();
         sd_event_unref(event);