diff --git a/PhysicsTools/PatAlgos/test/private/PATUserDataTestModule.cc b/PhysicsTools/PatAlgos/test/private/PATUserDataTestModule.cc
index bcb512dd5f1de..4e2f66333ffe6 100644
--- a/PhysicsTools/PatAlgos/test/private/PATUserDataTestModule.cc
+++ b/PhysicsTools/PatAlgos/test/private/PATUserDataTestModule.cc
@@ -22,7 +22,7 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -63,19 +63,19 @@ namespace edm {
 // class decleration
 //
 
-class PATUserDataTestModule : public edm::EDProducer {
+class PATUserDataTestModule : public edm::stream::EDProducer<> {
 public:
   explicit PATUserDataTestModule(const edm::ParameterSet&);
-  ~PATUserDataTestModule();
+  ~PATUserDataTestModule() override = default;
 
 private:
   virtual void produce(edm::Event&, const edm::EventSetup&) override;
 
   // ----------member data ---------------------------
-  edm::EDGetTokenT<edm::View<pat::Muon>> muonsToken_;
-  std::string label_;
+  const edm::EDGetTokenT<edm::View<pat::Muon>> muonsToken_;
+  const std::string label_;
   enum TestMode { TestRead, TestWrite, TestExternal };
-  TestMode mode_;
+  const TestMode mode_;
 };
 
 //
@@ -99,8 +99,6 @@ PATUserDataTestModule::PATUserDataTestModule(const edm::ParameterSet& iConfig)
   }
 }
 
-PATUserDataTestModule::~PATUserDataTestModule() {}
-
 // ------------ method called to for each event  ------------
 void PATUserDataTestModule::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
   using namespace edm;
diff --git a/PhysicsTools/PatAlgos/test/private/TestEventHypothesisReader.cc b/PhysicsTools/PatAlgos/test/private/TestEventHypothesisReader.cc
index 58092bcb75405..f7ce0e950bfe2 100644
--- a/PhysicsTools/PatAlgos/test/private/TestEventHypothesisReader.cc
+++ b/PhysicsTools/PatAlgos/test/private/TestEventHypothesisReader.cc
@@ -1,6 +1,6 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/stream/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
@@ -13,10 +13,10 @@
 #include "DataFormats/JetReco/interface/CaloJet.h"
 #include "DataFormats/MuonReco/interface/Muon.h"
 
-class TestEventHypothesisReader : public edm::EDAnalyzer {
+class TestEventHypothesisReader : public edm::stream::EDAnalyzer<> {
 public:
   TestEventHypothesisReader(const edm::ParameterSet &iConfig);
-  virtual void analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup);
+  void analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) override;
   void runTests(const pat::EventHypothesis &h);
 
 private:
diff --git a/PhysicsTools/PatAlgos/test/private/TestEventHypothesisWriter.cc b/PhysicsTools/PatAlgos/test/private/TestEventHypothesisWriter.cc
index fa50a0e696a0f..e982e72adf1da 100644
--- a/PhysicsTools/PatAlgos/test/private/TestEventHypothesisWriter.cc
+++ b/PhysicsTools/PatAlgos/test/private/TestEventHypothesisWriter.cc
@@ -1,6 +1,6 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
@@ -13,10 +13,10 @@
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/JetReco/interface/CaloJet.h"
 
-class TestEventHypothesisWriter : public edm::EDProducer {
+class TestEventHypothesisWriter : public edm::stream::EDProducer<> {
 public:
   TestEventHypothesisWriter(const edm::ParameterSet &iConfig);
-  virtual void produce(edm::Event &iEvent, const edm::EventSetup &iSetup);
+  void produce(edm::Event &iEvent, const edm::EventSetup &iSetup) override;
   void runTests(const pat::EventHypothesis &h);
 
 private: