diff --git a/Geometry/CaloTopology/test/BuildFile.xml b/Geometry/CaloTopology/test/BuildFile.xml
index e777e770913c2..a1f3dcf758d13 100644
--- a/Geometry/CaloTopology/test/BuildFile.xml
+++ b/Geometry/CaloTopology/test/BuildFile.xml
@@ -1,7 +1,9 @@
 <use   name="DataFormats/HcalDetId"/>
 <use   name="DataFormats/CaloTowers"/>
 <use   name="Geometry/CaloTopology"/>
-<bin   file="testCaloTowerTopology.cpp">
-</bin>
-<bin   file="testHcalTopology.cpp">
-</bin>
+<use   name="Geometry/Records"/>
+<use   name="Geometry/HcalCommonData"/>
+
+<flags   EDM_PLUGIN="1"/>
+<library   file="HcalTopologyTester.cc" name="testGeometryHcalTopology"> </library>
+
diff --git a/Geometry/CaloTopology/test/testHcalTopology.cpp b/Geometry/CaloTopology/test/HcalTopologyTester.cc
similarity index 51%
rename from Geometry/CaloTopology/test/testHcalTopology.cpp
rename to Geometry/CaloTopology/test/HcalTopologyTester.cc
index 82b5e24326678..2486019cdf70f 100644
--- a/Geometry/CaloTopology/test/testHcalTopology.cpp
+++ b/Geometry/CaloTopology/test/HcalTopologyTester.cc
@@ -2,18 +2,60 @@
 #include <string>
 #include <vector>
 
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/EDAnalyzer.h"
+
+#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 "DetectorDescription/Core/interface/DDCompactView.h"
+#include "Geometry/Records/interface/IdealGeometryRecord.h"
+#include "Geometry/Records/interface/HcalRecNumberingRecord.h"
+#include "Geometry/HcalCommonData/interface/HcalDDDRecConstants.h"
 #include "Geometry/CaloTopology/interface/HcalTopology.h"
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
 #include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
 
-int main(int /*argc*/, char** /*argv*/) {
+class HcalTopologyTester : public edm::EDAnalyzer {
+public:
+  explicit HcalTopologyTester(const edm::ParameterSet& );
+  ~HcalTopologyTester();
+
+  
+  virtual void analyze(const edm::Event&, const edm::EventSetup& );
+  void doTest(const HcalTopology& topology);
+
+private:
+  // ----------member data ---------------------------
+};
+
+HcalTopologyTester::HcalTopologyTester(const edm::ParameterSet& ) {}
+
 
-  // FIXME: for SLHC
-  HcalTopologyMode::Mode mode = HcalTopologyMode::LHC;
-  int maxDepthHB = 2;
-  int maxDepthHE = 3;
+HcalTopologyTester::~HcalTopologyTester() {}
+
+void HcalTopologyTester::analyze(const edm::Event& , 
+				 const edm::EventSetup& iSetup ) {
+
+
+  edm::ESTransientHandle<DDCompactView> pDD;
+  iSetup.get<IdealGeometryRecord>().get( pDD );
+  std::cout << "Gets Compact View\n";
+  edm::ESHandle<HcalDDDRecConstants> pHSNDC;
+  iSetup.get<HcalRecNumberingRecord>().get( pHSNDC );
+  std::cout << "Gets RecNumbering Record\n";
+  edm::ESHandle<HcalTopology> topo;
+  iSetup.get<HcalRecNumberingRecord>().get(topo);
+  if (topo.isValid()) doTest(*topo);
+  else                std::cout << "Cannot get a valid HcalTopology Object\n";
+}
+
+void HcalTopologyTester::doTest(const HcalTopology& topology) {
   
-  HcalTopology topology(mode, maxDepthHB, maxDepthHE);
   for (int idet=0; idet<4; idet++) {
     HcalSubdetector subdet = HcalBarrel;
     if (idet == 1)      subdet = HcalOuter;
@@ -55,5 +97,8 @@ int main(int /*argc*/, char** /*argv*/) {
       }
     }
   }
-  return 0;
+
 }
+
+//define this as a plug-in
+DEFINE_FWK_MODULE(HcalTopologyTester);
diff --git a/Geometry/CaloTopology/test/testCaloTowerTopology.cpp b/Geometry/CaloTopology/test/testCaloTowerTopology.cpp
deleted file mode 100644
index e85956f6a30bf..0000000000000
--- a/Geometry/CaloTopology/test/testCaloTowerTopology.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <iostream>
-#include <string>
-#include <vector>
-
-#include "Geometry/CaloTopology/interface/CaloTowerTopology.h"
-#include "DataFormats/CaloTowers/interface/CaloTowerDetId.h"
-
-int main(int /*argc*/, char** /*argv*/) {
-
-  CaloTowerTopology topology;
-  for (int ieta=-41; ieta<=41; ieta++) {
-    for (int iphi=1; iphi<=72; iphi++) {
-      if (CaloTowerDetId::validDetId(ieta,iphi)) {
-	const CaloTowerDetId id(ieta,iphi);
-	std::vector<DetId> idE = topology.east(id);
-	std::vector<DetId> idW = topology.west(id);
-	std::vector<DetId> idN = topology.north(id);
-	std::vector<DetId> idS = topology.south(id);
-	std::cout << "Neighbours for : Tower " << id << std::endl;
-	std::cout << "          " << idE.size() << " sets along East:";
-	for (unsigned int i=0; i<idE.size(); ++i) 
-	  std::cout << " " << (CaloTowerDetId)(idE[i]());
-	std::cout << std::endl;
-	std::cout << "          " << idW.size() << " sets along West:";
-	for (unsigned int i=0; i<idW.size(); ++i) 
-	  std::cout << " " << (CaloTowerDetId)(idW[i]());
-	std::cout << std::endl;
-	std::cout << "          " << idN.size() << " sets along North:";
-	for (unsigned int i=0; i<idN.size(); ++i) 
-	  std::cout << " " << (CaloTowerDetId)(idN[i]());
-	std::cout << std::endl;
-	std::cout << "          " << idS.size() << " sets along South:";
-	for (unsigned int i=0; i<idS.size(); ++i) 
-	  std::cout << " " << (CaloTowerDetId)(idS[i]());
-	std::cout << std::endl;
-      }
-    }
-  }
-  return 0;
-}
diff --git a/Geometry/CaloTopology/test/testHcalTopology_cfg.py b/Geometry/CaloTopology/test/testHcalTopology_cfg.py
new file mode 100644
index 0000000000000..b478ac6920308
--- /dev/null
+++ b/Geometry/CaloTopology/test/testHcalTopology_cfg.py
@@ -0,0 +1,51 @@
+import FWCore.ParameterSet.Config as cms
+
+process = cms.Process("PROD")
+process.load("SimGeneral.HepPDTESSource.pdt_cfi")
+
+process.load("Geometry.HcalCommonData.testHcalOnlyGeometryXML_cfi")
+process.load("Geometry.HcalCommonData.hcalDDConstants_cff")
+process.load("Geometry.HcalEventSetup.hcalTopologyIdeal_cfi")
+
+process.MessageLogger = cms.Service("MessageLogger",
+    destinations = cms.untracked.vstring('cout'),
+    categories = cms.untracked.vstring('HCalGeom'),
+    debugModules = cms.untracked.vstring('*'),
+    cout = cms.untracked.PSet(
+        threshold = cms.untracked.string('DEBUG'),
+        default = cms.untracked.PSet(
+            limit = cms.untracked.int32(0)
+        ),
+        HCalGeom = cms.untracked.PSet(
+            limit = cms.untracked.int32(0)
+        )
+    ),
+)
+
+process.load("IOMC.RandomEngine.IOMC_cff")
+process.RandomNumberGeneratorService.generator.initialSeed = 456789
+
+process.source = cms.Source("EmptySource")
+
+process.generator = cms.EDProducer("FlatRandomEGunProducer",
+    PGunParameters = cms.PSet(
+        PartID = cms.vint32(14),
+        MinEta = cms.double(-3.5),
+        MaxEta = cms.double(3.5),
+        MinPhi = cms.double(-3.14159265359),
+        MaxPhi = cms.double(3.14159265359),
+        MinE   = cms.double(9.99),
+        MaxE   = cms.double(10.01)
+    ),
+    AddAntiParticle = cms.bool(False),
+    Verbosity       = cms.untracked.int32(0),
+    firstRun        = cms.untracked.uint32(1)
+)
+
+process.maxEvents = cms.untracked.PSet(
+    input = cms.untracked.int32(1)
+)
+
+process.prod = cms.EDAnalyzer("HcalTopologyTester")
+
+process.p1 = cms.Path(process.generator*process.prod)