diff --git a/FWCore/Framework/test/BuildFile.xml b/FWCore/Framework/test/BuildFile.xml
index 39ad996d6c445..b5d260042c411 100644
--- a/FWCore/Framework/test/BuildFile.xml
+++ b/FWCore/Framework/test/BuildFile.xml
@@ -2,7 +2,7 @@
 <library   file="DummyData.cc,DummyRecord.cc,DepRecord.cc,Dummy2Record.cc,DepOn2Record.cc" name="FWCoreFrameworkTestDummyForEventSetup">
   <use   name="FWCore/Framework"/>
 </library>
-<library   file="MockEventProcessor.cc" name="FWCoreFrameworkTest">
+<library   file="MockEventProcessor.cc,stubs/TestBeginEndJobAnalyzer.cc" name="FWCoreFrameworkTest">
   <use   name="FWCore/Framework"/>
 </library>
 <library   file="stubs/TestOutputModule.cc" name="TestOutputModule">
@@ -131,8 +131,9 @@
   <use   name="FWCore/Framework"/>
   <use   name="cppunit"/>
 </library>
-<library   file="stubs/TestBeginEndJobAnalyzer.cc,stubs/TestBeginEndJobAnalyzerModule.cc" name="FWCoreFrameworkTestBeginEndJobAnalyzer">
+<library   file="stubs/TestBeginEndJobAnalyzerModule.cc" name="FWCoreFrameworkTestBeginEndJobAnalyzer">
   <flags   EDM_PLUGIN="1"/>
+  <lib   name="FWCoreFrameworkTest"/>
   <use   name="FWCore/Framework"/>
 </library>
 <library   file="stubs/TestFailuresAnalyzer.cc" name="FWCoreFrameworkTestFailuresAnalyzer">
@@ -169,6 +170,7 @@
   <use   name="cppunit"/>
 </bin>
 <bin   name="TestFWCoreFrameworkeventprocessor" file="testRunner.cpp,eventprocessor2_t.cppunit.cc,eventprocessor_t.cppunit.cc">
+  <lib   name="FWCoreFrameworkTest"/>
   <use   name="DataFormats/Provenance"/>
   <use   name="DataFormats/WrappedStdDictionaries"/>
   <use   name="FWCore/Framework"/>
diff --git a/FWCore/Framework/test/stubs/TestBeginEndJobAnalyzer.cc b/FWCore/Framework/test/stubs/TestBeginEndJobAnalyzer.cc
index bc46a2880c587..511a023c85506 100644
--- a/FWCore/Framework/test/stubs/TestBeginEndJobAnalyzer.cc
+++ b/FWCore/Framework/test/stubs/TestBeginEndJobAnalyzer.cc
@@ -26,6 +26,12 @@ void hello(const char * hi) {
   //std::cout << "IN " << hi << std::endl;
 }
 
+TestBeginEndJobAnalyzer::Control & 
+TestBeginEndJobAnalyzer::control() {
+  static Control l;
+  return l;
+}
+
 TestBeginEndJobAnalyzer::TestBeginEndJobAnalyzer(const edm::ParameterSet& /* iConfig */) {
    hello("constr");
 }
diff --git a/FWCore/Framework/test/stubs/TestBeginEndJobAnalyzer.h b/FWCore/Framework/test/stubs/TestBeginEndJobAnalyzer.h
index 7c700a9464f7d..0e13fb66e718c 100644
--- a/FWCore/Framework/test/stubs/TestBeginEndJobAnalyzer.h
+++ b/FWCore/Framework/test/stubs/TestBeginEndJobAnalyzer.h
@@ -30,31 +30,28 @@ class TestBeginEndJobAnalyzer : public edm::EDAnalyzer {
    ~TestBeginEndJobAnalyzer();
    
    
-   virtual void analyze(const edm::Event&, const edm::EventSetup&);
+   virtual void analyze(const edm::Event&, const edm::EventSetup&) override;
    
-   virtual void beginJob();
-   virtual void endJob();
-   virtual void beginRun(edm::Run const&, edm::EventSetup const&);
-   virtual void endRun(edm::Run const&, edm::EventSetup const&);
-   virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&);
-   virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&);
+   virtual void beginJob() override;
+   virtual void endJob() override;
+   virtual void beginRun(edm::Run const&, edm::EventSetup const&) override;
+   virtual void endRun(edm::Run const&, edm::EventSetup const&) override;
+   virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
+   virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
 
    
 
-   struct dso_export  Control {
-      bool beginJobCalled;
-      bool endJobCalled;
-      bool beginRunCalled;
-      bool endRunCalled;
-      bool beginLumiCalled;
-      bool endLumiCalled;
-      bool destructorCalled;
+   struct Control {
+      bool beginJobCalled = false;
+      bool endJobCalled = false;
+      bool beginRunCalled = false;
+      bool endRunCalled = false;
+      bool beginLumiCalled = false;
+      bool endLumiCalled = false;
+      bool destructorCalled = false;
    };
 
-   static Control & control() dso_export {
-       static Control l;
-       return l;
-   }
+   static Control & control();
 
 
 private: