diff --git a/Geometry/ForwardGeometry/plugins/CastorHardcodeGeometryEP.h b/Geometry/ForwardGeometry/plugins/CastorHardcodeGeometryEP.h
index a84e53fb8b530..3368db2eacab2 100644
--- a/Geometry/ForwardGeometry/plugins/CastorHardcodeGeometryEP.h
+++ b/Geometry/ForwardGeometry/plugins/CastorHardcodeGeometryEP.h
@@ -7,7 +7,6 @@
 // user include files
 #include "FWCore/Framework/interface/ModuleFactory.h"
 #include "FWCore/Framework/interface/ESProducer.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "Geometry/Records/interface/CastorGeometryRecord.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
 #include "Geometry/ForwardGeometry/interface/CastorHardcodeGeometryLoader.h"
diff --git a/Geometry/ForwardGeometry/plugins/ZdcHardcodeGeometryEP.h b/Geometry/ForwardGeometry/plugins/ZdcHardcodeGeometryEP.h
index eb045771803bd..ae0c2e414db37 100644
--- a/Geometry/ForwardGeometry/plugins/ZdcHardcodeGeometryEP.h
+++ b/Geometry/ForwardGeometry/plugins/ZdcHardcodeGeometryEP.h
@@ -7,7 +7,6 @@
 // user include files
 #include "FWCore/Framework/interface/ModuleFactory.h"
 #include "FWCore/Framework/interface/ESProducer.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "Geometry/Records/interface/ZDCGeometryRecord.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
 #include "Geometry/ForwardGeometry/interface/ZdcHardcodeGeometryLoader.h"
diff --git a/Geometry/ForwardGeometry/test/HFNoseGeometryTester.cc b/Geometry/ForwardGeometry/test/HFNoseGeometryTester.cc
index c093b880136d0..9f240e3de2009 100644
--- a/Geometry/ForwardGeometry/test/HFNoseGeometryTester.cc
+++ b/Geometry/ForwardGeometry/test/HFNoseGeometryTester.cc
@@ -9,7 +9,6 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESTransientHandle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
@@ -31,18 +30,16 @@ class HFNoseGeometryTester : public edm::one::EDAnalyzer<> {
   void doTestWafer(const HGCalGeometry* geom);
 
   const std::string name_;
+  const edm::ESGetToken<HGCalGeometry, IdealGeometryRecord> tokGeom_;
 };
 
 HFNoseGeometryTester::HFNoseGeometryTester(const edm::ParameterSet& iC)
-    : name_(iC.getParameter<std::string>("Detector")) {}
+    : name_(iC.getParameter<std::string>("Detector")),
+      tokGeom_(esConsumes<HGCalGeometry, IdealGeometryRecord>(edm::ESInputTag{"", name_})) {}
 
 void HFNoseGeometryTester::analyze(const edm::Event&, const edm::EventSetup& iSetup) {
-  edm::ESHandle<HGCalGeometry> geomH;
-  iSetup.get<IdealGeometryRecord>().get(name_, geomH);
-  const HGCalGeometry* geom = (geomH.product());
-  if (!geomH.isValid()) {
-    std::cout << "Cannot get valid HGCalGeometry Object for " << name_ << std::endl;
-  } else if (geom->topology().isHFNose()) {
+  const HGCalGeometry* geom = &iSetup.getData(tokGeom_);
+  if (geom->topology().isHFNose()) {
     doTestWafer(geom);
   } else {
     std::cout << name_ << " is not a valid name for HFNose Detecor" << std::endl;