diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
index 87998b2f4f376c37ab2083554b16bd00b3e43014..9a5e91f56157a813cdaeb048b5adbbb647ac6155 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
@@ -8,8 +8,10 @@ from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMufastHypoToolFromDict
 
 from TriggerMenuMT.HLTMenuConfig.Menu.ChainDictTools import splitChainDict
 
+from AthenaConfiguration.ComponentFactory import CompFactory
+
 def fakeHypoAlgCfg(flags, name="FakeHypoForMuon"):
-    from TrigUpgradeTest.TrigUpgradeTestConf import HLTTest__TestHypoAlg
+    HLTTest__TestHypoAlg=CompFactory.HLTTest.TestHypoAlg
     return HLTTest__TestHypoAlg( name, Input="" )
 
 def generateChains( flags, chainDict ):
@@ -69,7 +71,7 @@ def generateChains( flags, chainDict ):
     accMS.merge(recoMS, sequenceName=stepEFMSReco.getName())
 
     # TODO remove once full step is in place
-    from TrigUpgradeTest.TrigUpgradeTestConf import HLTTest__TestHypoTool
+    HLTTest__TestHypoTool=CompFactory.HLTTest.TestHypoTool
     fakeHypoAlg = fakeHypoAlgCfg(muonflags, name='FakeHypoForMuon')
     def makeFakeHypoTool(name, cfg):
         return HLTTest__TestHypoTool(name)