diff --git a/CondTools/DT/test/stubs/DTCompactMapDump.cc b/CondTools/DT/test/stubs/DTCompactMapDump.cc
index 7a3ca3720e775..ed70688b29b6e 100644
--- a/CondTools/DT/test/stubs/DTCompactMapDump.cc
+++ b/CondTools/DT/test/stubs/DTCompactMapDump.cc
@@ -25,8 +25,6 @@ namespace edmtest {
 
   DTCompactMapDump::DTCompactMapDump(int i) {}
 
-  DTCompactMapDump::~DTCompactMapDump() {}
-
   void DTCompactMapDump::analyze(const edm::Event& e, const edm::EventSetup& context) {}
 
   void DTCompactMapDump::endJob() {
diff --git a/CondTools/DT/test/stubs/DTCompactMapDump.h b/CondTools/DT/test/stubs/DTCompactMapDump.h
index 8cb61d0b76f2a..e46360d531e28 100644
--- a/CondTools/DT/test/stubs/DTCompactMapDump.h
+++ b/CondTools/DT/test/stubs/DTCompactMapDump.h
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -14,13 +14,13 @@ Toy EDAnalyzer for testing purposes only.
 #include <string>
 
 namespace edmtest {
-  class DTCompactMapDump : public edm::EDAnalyzer {
+  class DTCompactMapDump : public edm::one::EDAnalyzer<> {
   public:
     explicit DTCompactMapDump(edm::ParameterSet const& p);
     explicit DTCompactMapDump(int i);
-    virtual ~DTCompactMapDump();
-    virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
-    virtual void endJob();
+    ~DTCompactMapDump() override = default;
+    void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+    void endJob() override;
 
   private:
     std::string fileName;
diff --git a/CondTools/DT/test/stubs/DTFullMapDump.cc b/CondTools/DT/test/stubs/DTFullMapDump.cc
index 5d40e20ecb4f5..69fb62dcbcf8f 100644
--- a/CondTools/DT/test/stubs/DTFullMapDump.cc
+++ b/CondTools/DT/test/stubs/DTFullMapDump.cc
@@ -26,8 +26,6 @@ namespace edmtest {
 
   DTFullMapDump::DTFullMapDump(int i) {}
 
-  DTFullMapDump::~DTFullMapDump() {}
-
   void DTFullMapDump::analyze(const edm::Event& e, const edm::EventSetup& context) {}
 
   void DTFullMapDump::endJob() {
diff --git a/CondTools/DT/test/stubs/DTFullMapDump.h b/CondTools/DT/test/stubs/DTFullMapDump.h
index b96a314cc4a63..94cfcd4c78d34 100644
--- a/CondTools/DT/test/stubs/DTFullMapDump.h
+++ b/CondTools/DT/test/stubs/DTFullMapDump.h
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -14,13 +14,13 @@ Toy EDAnalyzer for testing purposes only.
 #include <string>
 
 namespace edmtest {
-  class DTFullMapDump : public edm::EDAnalyzer {
+  class DTFullMapDump : public edm::one::EDAnalyzer<> {
   public:
     explicit DTFullMapDump(edm::ParameterSet const& p);
     explicit DTFullMapDump(int i);
-    virtual ~DTFullMapDump();
-    virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
-    virtual void endJob();
+    ~DTFullMapDump() override = default;
+    void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+    void endJob() override;
 
   private:
     std::string fileName;
diff --git a/CondTools/DT/test/stubs/DTGeometryDump.cc b/CondTools/DT/test/stubs/DTGeometryDump.cc
index 58c91d90e5546..8694541680699 100644
--- a/CondTools/DT/test/stubs/DTGeometryDump.cc
+++ b/CondTools/DT/test/stubs/DTGeometryDump.cc
@@ -22,8 +22,6 @@ namespace edmtest {
 
   DTGeometryDump::DTGeometryDump(int i) : dtgeomToken_(esConsumes()) {}
 
-  DTGeometryDump::~DTGeometryDump() {}
-
   void DTGeometryDump::analyze(const edm::Event& e, const edm::EventSetup& context) {
     using namespace edm::eventsetup;
     auto muonGeom = context.getHandle(dtgeomToken_);
diff --git a/CondTools/DT/test/stubs/DTGeometryDump.h b/CondTools/DT/test/stubs/DTGeometryDump.h
index fbc1c7519b80c..942c5051be166 100644
--- a/CondTools/DT/test/stubs/DTGeometryDump.h
+++ b/CondTools/DT/test/stubs/DTGeometryDump.h
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -16,12 +16,12 @@ class DTGeometry;
 class MuonGeometryRecord;
 
 namespace edmtest {
-  class DTGeometryDump : public edm::EDAnalyzer {
+  class DTGeometryDump : public edm::one::EDAnalyzer<> {
   public:
     explicit DTGeometryDump(edm::ParameterSet const& p);
     explicit DTGeometryDump(int i);
-    virtual ~DTGeometryDump();
-    virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
+    ~DTGeometryDump() override = default;
+    void analyze(const edm::Event& e, const edm::EventSetup& c) override;
 
   private:
     edm::ESGetToken<DTGeometry, MuonGeometryRecord> dtgeomToken_;
diff --git a/CondTools/DT/test/stubs/DTHVDump.cc b/CondTools/DT/test/stubs/DTHVDump.cc
index 503a426170f04..d7595e0de7e56 100644
--- a/CondTools/DT/test/stubs/DTHVDump.cc
+++ b/CondTools/DT/test/stubs/DTHVDump.cc
@@ -26,8 +26,6 @@ namespace edmtest {
 
   DTHVDump::DTHVDump(int i) : dthvstatusToken_(esConsumes()) {}
 
-  DTHVDump::~DTHVDump() {}
-
   void DTHVDump::analyze(const edm::Event& e, const edm::EventSetup& context) {
     using namespace edm::eventsetup;
     // Context is not used.
diff --git a/CondTools/DT/test/stubs/DTHVDump.h b/CondTools/DT/test/stubs/DTHVDump.h
index 3f512bbe6d87d..7cc3ae01ae43e 100644
--- a/CondTools/DT/test/stubs/DTHVDump.h
+++ b/CondTools/DT/test/stubs/DTHVDump.h
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -15,12 +15,12 @@ Toy EDAnalyzer for testing purposes only.
 class DTHVStatus;
 class DTHVStatusRcd;
 namespace edmtest {
-  class DTHVDump : public edm::EDAnalyzer {
+  class DTHVDump : public edm::one::EDAnalyzer<> {
   public:
     explicit DTHVDump(edm::ParameterSet const& p);
     explicit DTHVDump(int i);
-    virtual ~DTHVDump();
-    virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
+    ~DTHVDump() override = default;
+    void analyze(const edm::Event& e, const edm::EventSetup& c) override;
 
   private:
     edm::ESGetToken<DTHVStatus, DTHVStatusRcd> dthvstatusToken_;
diff --git a/CondTools/DT/test/stubs/DTKeyedConfigDump.h b/CondTools/DT/test/stubs/DTKeyedConfigDump.h
index 05a578797576d..bface10cb5dec 100644
--- a/CondTools/DT/test/stubs/DTKeyedConfigDump.h
+++ b/CondTools/DT/test/stubs/DTKeyedConfigDump.h
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -21,7 +21,7 @@ Toy EDAnalyzer for testing purposes only.
 #include <string>
 
 namespace edmtest {
-  class DTKeyedConfigDump : public edm::EDAnalyzer {
+  class DTKeyedConfigDump : public edm::one::EDAnalyzer<> {
   public:
     explicit DTKeyedConfigDump(edm::ParameterSet const& p);
 
diff --git a/CondTools/DT/test/stubs/DTTimeUtility.cc b/CondTools/DT/test/stubs/DTTimeUtility.cc
index 9cbb795214616..b7925176b44e2 100644
--- a/CondTools/DT/test/stubs/DTTimeUtility.cc
+++ b/CondTools/DT/test/stubs/DTTimeUtility.cc
@@ -35,8 +35,6 @@ namespace edmtest {
 
   DTTimeUtility::DTTimeUtility(int i) {}
 
-  DTTimeUtility::~DTTimeUtility() {}
-
   void DTTimeUtility::analyze(const edm::Event& e, const edm::EventSetup& context) {
     //    using namespace edm::eventsetup;
     long long int condConv = ((((condTime >> 32) & 0xFFFFFFFF) * 1000000000) + ((condTime & 0xFFFFFFFF) * 1000));
diff --git a/CondTools/DT/test/stubs/DTTimeUtility.h b/CondTools/DT/test/stubs/DTTimeUtility.h
index 07af4034a52c0..29243544638d5 100644
--- a/CondTools/DT/test/stubs/DTTimeUtility.h
+++ b/CondTools/DT/test/stubs/DTTimeUtility.h
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -14,12 +14,12 @@ Toy EDAnalyzer for testing purposes only.
 #include <string>
 
 namespace edmtest {
-  class DTTimeUtility : public edm::EDAnalyzer {
+  class DTTimeUtility : public edm::one::EDAnalyzer<> {
   public:
     explicit DTTimeUtility(edm::ParameterSet const& p);
     explicit DTTimeUtility(int i);
-    virtual ~DTTimeUtility();
-    virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
+    ~DTTimeUtility() override = default;
+    void analyze(const edm::Event& e, const edm::EventSetup& c) override;
 
   private:
     int year;
diff --git a/CondTools/DT/test/validate/DTCCBConfigValidateDBRead.cc b/CondTools/DT/test/validate/DTCCBConfigValidateDBRead.cc
index eea3710803c09..8dd30a6a6ec02 100644
--- a/CondTools/DT/test/validate/DTCCBConfigValidateDBRead.cc
+++ b/CondTools/DT/test/validate/DTCCBConfigValidateDBRead.cc
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -31,8 +31,6 @@ DTCCBConfigValidateDBRead::DTCCBConfigValidateDBRead(edm::ParameterSet const& p)
 
 DTCCBConfigValidateDBRead::DTCCBConfigValidateDBRead(int i) : dtccbToken_(esConsumes()) {}
 
-DTCCBConfigValidateDBRead::~DTCCBConfigValidateDBRead() {}
-
 void DTCCBConfigValidateDBRead::analyze(const edm::Event& e, const edm::EventSetup& context) {
   using namespace edm::eventsetup;
   // Context is not used.
diff --git a/CondTools/DT/test/validate/DTCCBConfigValidateDBRead.h b/CondTools/DT/test/validate/DTCCBConfigValidateDBRead.h
index 7150f5c315431..5ee993d6ca2a0 100644
--- a/CondTools/DT/test/validate/DTCCBConfigValidateDBRead.h
+++ b/CondTools/DT/test/validate/DTCCBConfigValidateDBRead.h
@@ -4,7 +4,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -12,13 +12,13 @@ Toy EDAnalyzer for testing purposes only.
 class DTConfigKey;
 class DTCCBConfig;
 class DTCCBConfigRcd;
-class DTCCBConfigValidateDBRead : public edm::EDAnalyzer {
+class DTCCBConfigValidateDBRead : public edm::one::EDAnalyzer<> {
 public:
   explicit DTCCBConfigValidateDBRead(edm::ParameterSet const& p);
   explicit DTCCBConfigValidateDBRead(int i);
-  virtual ~DTCCBConfigValidateDBRead();
-  virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
-  virtual void endJob();
+  ~DTCCBConfigValidateDBRead() override = default;
+  void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+  void endJob() override;
 
 private:
   std::string dataFileName;
diff --git a/CondTools/DT/test/validate/DTCompMapValidateDBRead.cc b/CondTools/DT/test/validate/DTCompMapValidateDBRead.cc
index d5058ff51b376..9dededf727b3a 100644
--- a/CondTools/DT/test/validate/DTCompMapValidateDBRead.cc
+++ b/CondTools/DT/test/validate/DTCompMapValidateDBRead.cc
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -31,8 +31,6 @@ DTCompMapValidateDBRead::DTCompMapValidateDBRead(edm::ParameterSet const& p)
 
 DTCompMapValidateDBRead::DTCompMapValidateDBRead(int i) : dtreadoutmappingToken_(esConsumes()) {}
 
-DTCompMapValidateDBRead::~DTCompMapValidateDBRead() {}
-
 void DTCompMapValidateDBRead::analyze(const edm::Event& e, const edm::EventSetup& context) {
   using namespace edm::eventsetup;
   // Context is not used.
diff --git a/CondTools/DT/test/validate/DTCompMapValidateDBRead.h b/CondTools/DT/test/validate/DTCompMapValidateDBRead.h
index c83caa8c71498..4287ee4dde5fe 100644
--- a/CondTools/DT/test/validate/DTCompMapValidateDBRead.h
+++ b/CondTools/DT/test/validate/DTCompMapValidateDBRead.h
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -13,13 +13,13 @@ Toy EDAnalyzer for testing purposes only.
 
 class DTReadOutMapping;
 class DTReadOutMappingRcd;
-class DTCompMapValidateDBRead : public edm::EDAnalyzer {
+class DTCompMapValidateDBRead : public edm::one::EDAnalyzer<> {
 public:
   explicit DTCompMapValidateDBRead(edm::ParameterSet const& p);
   explicit DTCompMapValidateDBRead(int i);
-  virtual ~DTCompMapValidateDBRead();
-  virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
-  virtual void endJob();
+  ~DTCompMapValidateDBRead() override = default;
+  void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+  void endJob() override;
 
 private:
   std::string dataFileName;
diff --git a/CondTools/DT/test/validate/DTDeadFlagValidateDBRead.cc b/CondTools/DT/test/validate/DTDeadFlagValidateDBRead.cc
index f5989f5870c50..e62d2d75856db 100644
--- a/CondTools/DT/test/validate/DTDeadFlagValidateDBRead.cc
+++ b/CondTools/DT/test/validate/DTDeadFlagValidateDBRead.cc
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -31,8 +31,6 @@ DTDeadFlagValidateDBRead::DTDeadFlagValidateDBRead(edm::ParameterSet const& p)
 
 DTDeadFlagValidateDBRead::DTDeadFlagValidateDBRead(int i) : dtdeadflagToken_(esConsumes()) {}
 
-DTDeadFlagValidateDBRead::~DTDeadFlagValidateDBRead() {}
-
 void DTDeadFlagValidateDBRead::analyze(const edm::Event& e, const edm::EventSetup& context) {
   using namespace edm::eventsetup;
   // Context is not used.
diff --git a/CondTools/DT/test/validate/DTDeadFlagValidateDBRead.h b/CondTools/DT/test/validate/DTDeadFlagValidateDBRead.h
index 1255f9b7457f0..7c92d5975aa25 100644
--- a/CondTools/DT/test/validate/DTDeadFlagValidateDBRead.h
+++ b/CondTools/DT/test/validate/DTDeadFlagValidateDBRead.h
@@ -5,20 +5,20 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 class DTDeadFlag;
 class DTDeadFlagRcd;
-class DTDeadFlagValidateDBRead : public edm::EDAnalyzer {
+class DTDeadFlagValidateDBRead : public edm::one::EDAnalyzer<> {
 public:
   explicit DTDeadFlagValidateDBRead(edm::ParameterSet const& p);
   explicit DTDeadFlagValidateDBRead(int i);
-  virtual ~DTDeadFlagValidateDBRead();
-  virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
-  virtual void endJob();
+  ~DTDeadFlagValidateDBRead() override = default;
+  void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+  void endJob() override;
 
 private:
   std::string dataFileName;
diff --git a/CondTools/DT/test/validate/DTHVStatusValidateDBRead.cc b/CondTools/DT/test/validate/DTHVStatusValidateDBRead.cc
index 14fc6d432fd59..63b4cf4f27054 100644
--- a/CondTools/DT/test/validate/DTHVStatusValidateDBRead.cc
+++ b/CondTools/DT/test/validate/DTHVStatusValidateDBRead.cc
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -31,8 +31,6 @@ DTHVStatusValidateDBRead::DTHVStatusValidateDBRead(edm::ParameterSet const& p)
 
 DTHVStatusValidateDBRead::DTHVStatusValidateDBRead(int i) : dthvstatusToken_(esConsumes()) {}
 
-DTHVStatusValidateDBRead::~DTHVStatusValidateDBRead() {}
-
 void DTHVStatusValidateDBRead::analyze(const edm::Event& e, const edm::EventSetup& context) {
   using namespace edm::eventsetup;
   // Context is not used.
diff --git a/CondTools/DT/test/validate/DTHVStatusValidateDBRead.h b/CondTools/DT/test/validate/DTHVStatusValidateDBRead.h
index 7d22769134d31..6925d54d2a4d5 100644
--- a/CondTools/DT/test/validate/DTHVStatusValidateDBRead.h
+++ b/CondTools/DT/test/validate/DTHVStatusValidateDBRead.h
@@ -5,20 +5,20 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 class DTHVStatus;
 class DTHVStatusRcd;
-class DTHVStatusValidateDBRead : public edm::EDAnalyzer {
+class DTHVStatusValidateDBRead : public edm::one::EDAnalyzer<> {
 public:
   explicit DTHVStatusValidateDBRead(edm::ParameterSet const& p);
   explicit DTHVStatusValidateDBRead(int i);
-  virtual ~DTHVStatusValidateDBRead();
-  virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
-  virtual void endJob();
+  ~DTHVStatusValidateDBRead() override = default;
+  void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+  void endJob() override;
 
 private:
   std::string dataFileName;
diff --git a/CondTools/DT/test/validate/DTLVStatusValidateDBRead.cc b/CondTools/DT/test/validate/DTLVStatusValidateDBRead.cc
index f4d54eba544d8..7ed61d0fe64ee 100644
--- a/CondTools/DT/test/validate/DTLVStatusValidateDBRead.cc
+++ b/CondTools/DT/test/validate/DTLVStatusValidateDBRead.cc
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -31,8 +31,6 @@ DTLVStatusValidateDBRead::DTLVStatusValidateDBRead(edm::ParameterSet const& p)
 
 DTLVStatusValidateDBRead::DTLVStatusValidateDBRead(int i) : dtlvstatusToken_(esConsumes()) {}
 
-DTLVStatusValidateDBRead::~DTLVStatusValidateDBRead() {}
-
 void DTLVStatusValidateDBRead::analyze(const edm::Event& e, const edm::EventSetup& context) {
   using namespace edm::eventsetup;
   // Context is not used.
diff --git a/CondTools/DT/test/validate/DTLVStatusValidateDBRead.h b/CondTools/DT/test/validate/DTLVStatusValidateDBRead.h
index 8f24277d50ffe..a3c70065492bd 100644
--- a/CondTools/DT/test/validate/DTLVStatusValidateDBRead.h
+++ b/CondTools/DT/test/validate/DTLVStatusValidateDBRead.h
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -13,13 +13,13 @@ Toy EDAnalyzer for testing purposes only.
 
 class DTLVStatus;
 class DTLVStatusRcd;
-class DTLVStatusValidateDBRead : public edm::EDAnalyzer {
+class DTLVStatusValidateDBRead : public edm::one::EDAnalyzer<> {
 public:
   explicit DTLVStatusValidateDBRead(edm::ParameterSet const& p);
   explicit DTLVStatusValidateDBRead(int i);
-  virtual ~DTLVStatusValidateDBRead();
-  virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
-  virtual void endJob();
+  ~DTLVStatusValidateDBRead() override = default;
+  void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+  void endJob() override;
 
 private:
   std::string dataFileName;
diff --git a/CondTools/DT/test/validate/DTMtimeValidateDBRead.cc b/CondTools/DT/test/validate/DTMtimeValidateDBRead.cc
index eb37bffff8cf5..300dcd7846a6c 100644
--- a/CondTools/DT/test/validate/DTMtimeValidateDBRead.cc
+++ b/CondTools/DT/test/validate/DTMtimeValidateDBRead.cc
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -35,8 +35,6 @@ DTMtimeValidateDBRead::DTMtimeValidateDBRead(edm::ParameterSet const& p)
 
 DTMtimeValidateDBRead::DTMtimeValidateDBRead(int i) : dtmtTimeToken_(esConsumes()), dtrecoCondToken_(esConsumes()) {}
 
-DTMtimeValidateDBRead::~DTMtimeValidateDBRead() {}
-
 void DTMtimeValidateDBRead::analyze(const edm::Event& e, const edm::EventSetup& context) {
   using namespace edm::eventsetup;
   // Context is not used.
diff --git a/CondTools/DT/test/validate/DTMtimeValidateDBRead.h b/CondTools/DT/test/validate/DTMtimeValidateDBRead.h
index ce81cccf8c893..eabd40bc51afd 100644
--- a/CondTools/DT/test/validate/DTMtimeValidateDBRead.h
+++ b/CondTools/DT/test/validate/DTMtimeValidateDBRead.h
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -15,13 +15,13 @@ class DTMtime;
 class DTMtimeRcd;
 class DTRecoConditions;
 class DTRecoConditionsVdriftRcd;
-class DTMtimeValidateDBRead : public edm::EDAnalyzer {
+class DTMtimeValidateDBRead : public edm::one::EDAnalyzer<> {
 public:
   explicit DTMtimeValidateDBRead(edm::ParameterSet const& p);
   explicit DTMtimeValidateDBRead(int i);
-  virtual ~DTMtimeValidateDBRead();
-  virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
-  virtual void endJob();
+  ~DTMtimeValidateDBRead() override = default;
+  void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+  void endJob() override;
 
 private:
   std::string dataFileName;
diff --git a/CondTools/DT/test/validate/DTPerformanceValidateDBRead.cc b/CondTools/DT/test/validate/DTPerformanceValidateDBRead.cc
index 7ea71c56d5cab..b7ad7ef4619ca 100644
--- a/CondTools/DT/test/validate/DTPerformanceValidateDBRead.cc
+++ b/CondTools/DT/test/validate/DTPerformanceValidateDBRead.cc
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -31,8 +31,6 @@ DTPerformanceValidateDBRead::DTPerformanceValidateDBRead(edm::ParameterSet const
 
 DTPerformanceValidateDBRead::DTPerformanceValidateDBRead(int i) : dtperfToken_(esConsumes()) {}
 
-DTPerformanceValidateDBRead::~DTPerformanceValidateDBRead() {}
-
 void DTPerformanceValidateDBRead::analyze(const edm::Event& e, const edm::EventSetup& context) {
   using namespace edm::eventsetup;
   // Context is not used.
diff --git a/CondTools/DT/test/validate/DTPerformanceValidateDBRead.h b/CondTools/DT/test/validate/DTPerformanceValidateDBRead.h
index f789eb17f8dec..c2d0acc18b354 100644
--- a/CondTools/DT/test/validate/DTPerformanceValidateDBRead.h
+++ b/CondTools/DT/test/validate/DTPerformanceValidateDBRead.h
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -13,13 +13,13 @@ Toy EDAnalyzer for testing purposes only.
 
 class DTPerformance;
 class DTPerformanceRcd;
-class DTPerformanceValidateDBRead : public edm::EDAnalyzer {
+class DTPerformanceValidateDBRead : public edm::one::EDAnalyzer<> {
 public:
   explicit DTPerformanceValidateDBRead(edm::ParameterSet const& p);
   explicit DTPerformanceValidateDBRead(int i);
-  virtual ~DTPerformanceValidateDBRead();
-  virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
-  virtual void endJob();
+  ~DTPerformanceValidateDBRead() override = default;
+  void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+  void endJob() override;
 
 private:
   std::string dataFileName;
diff --git a/CondTools/DT/test/validate/DTROMapValidateDBRead.cc b/CondTools/DT/test/validate/DTROMapValidateDBRead.cc
index 7896e6c993b5e..c6352ade8232d 100644
--- a/CondTools/DT/test/validate/DTROMapValidateDBRead.cc
+++ b/CondTools/DT/test/validate/DTROMapValidateDBRead.cc
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -31,8 +31,6 @@ DTROMapValidateDBRead::DTROMapValidateDBRead(edm::ParameterSet const& p)
 
 DTROMapValidateDBRead::DTROMapValidateDBRead(int i) : dtreadoutmappingToken_(esConsumes()) {}
 
-DTROMapValidateDBRead::~DTROMapValidateDBRead() {}
-
 void DTROMapValidateDBRead::analyze(const edm::Event& e, const edm::EventSetup& context) {
   using namespace edm::eventsetup;
   // Context is not used.
diff --git a/CondTools/DT/test/validate/DTROMapValidateDBRead.h b/CondTools/DT/test/validate/DTROMapValidateDBRead.h
index ef436d1fe2ec2..bf756cd1ed405 100644
--- a/CondTools/DT/test/validate/DTROMapValidateDBRead.h
+++ b/CondTools/DT/test/validate/DTROMapValidateDBRead.h
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -14,13 +14,13 @@ Toy EDAnalyzer for testing purposes only.
 class DTReadOutMapping;
 class DTReadOutMappingRcd;
 
-class DTROMapValidateDBRead : public edm::EDAnalyzer {
+class DTROMapValidateDBRead : public edm::one::EDAnalyzer<> {
 public:
   explicit DTROMapValidateDBRead(edm::ParameterSet const& p);
   explicit DTROMapValidateDBRead(int i);
-  virtual ~DTROMapValidateDBRead();
-  virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
-  virtual void endJob();
+  ~DTROMapValidateDBRead() override = default;
+  void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+  void endJob() override;
 
 private:
   std::string dataFileName;
diff --git a/CondTools/DT/test/validate/DTRangeT0ValidateDBRead.cc b/CondTools/DT/test/validate/DTRangeT0ValidateDBRead.cc
index 9d435269d3df3..b80b34ca41a1c 100644
--- a/CondTools/DT/test/validate/DTRangeT0ValidateDBRead.cc
+++ b/CondTools/DT/test/validate/DTRangeT0ValidateDBRead.cc
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -31,8 +31,6 @@ DTRangeT0ValidateDBRead::DTRangeT0ValidateDBRead(edm::ParameterSet const& p)
 
 DTRangeT0ValidateDBRead::DTRangeT0ValidateDBRead(int i) : dtrangeToken_(esConsumes()) {}
 
-DTRangeT0ValidateDBRead::~DTRangeT0ValidateDBRead() {}
-
 void DTRangeT0ValidateDBRead::analyze(const edm::Event& e, const edm::EventSetup& context) {
   using namespace edm::eventsetup;
   // Context is not used.
diff --git a/CondTools/DT/test/validate/DTRangeT0ValidateDBRead.h b/CondTools/DT/test/validate/DTRangeT0ValidateDBRead.h
index baf4ec326da8c..187f99383c6ed 100644
--- a/CondTools/DT/test/validate/DTRangeT0ValidateDBRead.h
+++ b/CondTools/DT/test/validate/DTRangeT0ValidateDBRead.h
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -14,13 +14,13 @@ Toy EDAnalyzer for testing purposes only.
 class DTRangeT0;
 class DTRangeT0Rcd;
 
-class DTRangeT0ValidateDBRead : public edm::EDAnalyzer {
+class DTRangeT0ValidateDBRead : public edm::one::EDAnalyzer<> {
 public:
   explicit DTRangeT0ValidateDBRead(edm::ParameterSet const& p);
   explicit DTRangeT0ValidateDBRead(int i);
-  virtual ~DTRangeT0ValidateDBRead();
-  virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
-  virtual void endJob();
+  ~DTRangeT0ValidateDBRead() override = default;
+  void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+  void endJob() override;
 
 private:
   std::string dataFileName;
diff --git a/CondTools/DT/test/validate/DTStatusFlagValidateDBRead.cc b/CondTools/DT/test/validate/DTStatusFlagValidateDBRead.cc
index b617adcacfea9..57d04e5dd8c4c 100644
--- a/CondTools/DT/test/validate/DTStatusFlagValidateDBRead.cc
+++ b/CondTools/DT/test/validate/DTStatusFlagValidateDBRead.cc
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -31,8 +31,6 @@ DTStatusFlagValidateDBRead::DTStatusFlagValidateDBRead(edm::ParameterSet const&
 
 DTStatusFlagValidateDBRead::DTStatusFlagValidateDBRead(int i) : dtstatusFlagToken_(esConsumes()) {}
 
-DTStatusFlagValidateDBRead::~DTStatusFlagValidateDBRead() {}
-
 void DTStatusFlagValidateDBRead::analyze(const edm::Event& e, const edm::EventSetup& context) {
   using namespace edm::eventsetup;
   // Context is not used.
diff --git a/CondTools/DT/test/validate/DTStatusFlagValidateDBRead.h b/CondTools/DT/test/validate/DTStatusFlagValidateDBRead.h
index fb8527f7b97b8..752f20a21c895 100644
--- a/CondTools/DT/test/validate/DTStatusFlagValidateDBRead.h
+++ b/CondTools/DT/test/validate/DTStatusFlagValidateDBRead.h
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -13,13 +13,13 @@ Toy EDAnalyzer for testing purposes only.
 
 class DTStatusFlag;
 class DTStatusFlagRcd;
-class DTStatusFlagValidateDBRead : public edm::EDAnalyzer {
+class DTStatusFlagValidateDBRead : public edm::one::EDAnalyzer<> {
 public:
   explicit DTStatusFlagValidateDBRead(edm::ParameterSet const& p);
   explicit DTStatusFlagValidateDBRead(int i);
-  virtual ~DTStatusFlagValidateDBRead();
-  virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
-  virtual void endJob();
+  ~DTStatusFlagValidateDBRead() override = default;
+  void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+  void endJob() override;
 
 private:
   std::string dataFileName;
diff --git a/CondTools/DT/test/validate/DTT0ValidateDBRead.cc b/CondTools/DT/test/validate/DTT0ValidateDBRead.cc
index 325343d771175..63943debcd7d7 100644
--- a/CondTools/DT/test/validate/DTT0ValidateDBRead.cc
+++ b/CondTools/DT/test/validate/DTT0ValidateDBRead.cc
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -31,8 +31,6 @@ DTT0ValidateDBRead::DTT0ValidateDBRead(edm::ParameterSet const& p)
 
 DTT0ValidateDBRead::DTT0ValidateDBRead(int i) : dtT0Token_(esConsumes()) {}
 
-DTT0ValidateDBRead::~DTT0ValidateDBRead() {}
-
 void DTT0ValidateDBRead::analyze(const edm::Event& e, const edm::EventSetup& context) {
   using namespace edm::eventsetup;
   // Context is not used.
diff --git a/CondTools/DT/test/validate/DTT0ValidateDBRead.h b/CondTools/DT/test/validate/DTT0ValidateDBRead.h
index a99961d48f21f..35a420ec64547 100644
--- a/CondTools/DT/test/validate/DTT0ValidateDBRead.h
+++ b/CondTools/DT/test/validate/DTT0ValidateDBRead.h
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -13,13 +13,13 @@ Toy EDAnalyzer for testing purposes only.
 
 class DTT0;
 class DTT0Rcd;
-class DTT0ValidateDBRead : public edm::EDAnalyzer {
+class DTT0ValidateDBRead : public edm::one::EDAnalyzer<> {
 public:
   explicit DTT0ValidateDBRead(edm::ParameterSet const& p);
   explicit DTT0ValidateDBRead(int i);
-  virtual ~DTT0ValidateDBRead();
-  virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
-  virtual void endJob();
+  ~DTT0ValidateDBRead() override = default;
+  void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+  void endJob() override;
 
 private:
   std::string dataFileName;
diff --git a/CondTools/DT/test/validate/DTTPGParametersValidateDBRead.cc b/CondTools/DT/test/validate/DTTPGParametersValidateDBRead.cc
index a208bb23ad85f..faaa0d3545205 100644
--- a/CondTools/DT/test/validate/DTTPGParametersValidateDBRead.cc
+++ b/CondTools/DT/test/validate/DTTPGParametersValidateDBRead.cc
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -31,8 +31,6 @@ DTTPGParametersValidateDBRead::DTTPGParametersValidateDBRead(edm::ParameterSet c
 
 DTTPGParametersValidateDBRead::DTTPGParametersValidateDBRead(int i) : dttpgPramToken_(esConsumes()) {}
 
-DTTPGParametersValidateDBRead::~DTTPGParametersValidateDBRead() {}
-
 void DTTPGParametersValidateDBRead::analyze(const edm::Event& e, const edm::EventSetup& context) {
   using namespace edm::eventsetup;
   // Context is not used.
diff --git a/CondTools/DT/test/validate/DTTPGParametersValidateDBRead.h b/CondTools/DT/test/validate/DTTPGParametersValidateDBRead.h
index 6c6082d92154f..28ff1e7a76b5d 100644
--- a/CondTools/DT/test/validate/DTTPGParametersValidateDBRead.h
+++ b/CondTools/DT/test/validate/DTTPGParametersValidateDBRead.h
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -13,13 +13,13 @@ Toy EDAnalyzer for testing purposes only.
 
 class DTTPGParameters;
 class DTTPGParametersRcd;
-class DTTPGParametersValidateDBRead : public edm::EDAnalyzer {
+class DTTPGParametersValidateDBRead : public edm::one::EDAnalyzer<> {
 public:
   explicit DTTPGParametersValidateDBRead(edm::ParameterSet const& p);
   explicit DTTPGParametersValidateDBRead(int i);
-  virtual ~DTTPGParametersValidateDBRead();
-  virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
-  virtual void endJob();
+  ~DTTPGParametersValidateDBRead() override = default;
+  void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+  void endJob() override;
 
 private:
   std::string dataFileName;
diff --git a/CondTools/DT/test/validate/DTTtrigValidateDBRead.cc b/CondTools/DT/test/validate/DTTtrigValidateDBRead.cc
index bd9917d6f8d58..f64f278e364ea 100644
--- a/CondTools/DT/test/validate/DTTtrigValidateDBRead.cc
+++ b/CondTools/DT/test/validate/DTTtrigValidateDBRead.cc
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -31,8 +31,6 @@ DTTtrigValidateDBRead::DTTtrigValidateDBRead(edm::ParameterSet const& p)
 
 DTTtrigValidateDBRead::DTTtrigValidateDBRead(int i) : dtTrigToken_(esConsumes()) {}
 
-DTTtrigValidateDBRead::~DTTtrigValidateDBRead() {}
-
 void DTTtrigValidateDBRead::analyze(const edm::Event& e, const edm::EventSetup& context) {
   using namespace edm::eventsetup;
   // Context is not used.
diff --git a/CondTools/DT/test/validate/DTTtrigValidateDBRead.h b/CondTools/DT/test/validate/DTTtrigValidateDBRead.h
index 925d47d137728..e82b27760e14a 100644
--- a/CondTools/DT/test/validate/DTTtrigValidateDBRead.h
+++ b/CondTools/DT/test/validate/DTTtrigValidateDBRead.h
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -13,13 +13,13 @@ Toy EDAnalyzer for testing purposes only.
 class DTTtrig;
 class DTTtrigRcd;
 
-class DTTtrigValidateDBRead : public edm::EDAnalyzer {
+class DTTtrigValidateDBRead : public edm::one::EDAnalyzer<> {
 public:
   explicit DTTtrigValidateDBRead(edm::ParameterSet const& p);
   explicit DTTtrigValidateDBRead(int i);
-  virtual ~DTTtrigValidateDBRead();
-  virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
-  virtual void endJob();
+  ~DTTtrigValidateDBRead() override = default;
+  void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+  void endJob() override;
 
 private:
   std::string dataFileName;