diff --git a/examples/ClientTests/scripts/MiniTel.py b/examples/ClientTests/scripts/MiniTel.py
index ab2a1b33684523692170b04c1b33dfcfbe558265..dd43b0781f3f22321095b382253a41459c853d4d 100644
--- a/examples/ClientTests/scripts/MiniTel.py
+++ b/examples/ClientTests/scripts/MiniTel.py
@@ -9,12 +9,10 @@ import os, sys
 
 """
 def run():
-  from MiniTelSetup import Setup as MiniTel
-  m = MiniTel()
-
+  from MiniTelSetup import Setup
+  m = Setup()
   if len(sys.argv) >= 2 and sys.argv[1] =="batch":
     m.kernel.UI = ''
-
   m.configure()
   m.defineOutput()
   m.setupGun()
diff --git a/examples/ClientTests/scripts/MiniTelEnergyDeposits.py b/examples/ClientTests/scripts/MiniTelEnergyDeposits.py
index 936257f14ade2b0286bc4719496ffe1b1d9334b6..6227ba5a9cc172566fc04b7472cbf6f4ec99b39b 100644
--- a/examples/ClientTests/scripts/MiniTelEnergyDeposits.py
+++ b/examples/ClientTests/scripts/MiniTelEnergyDeposits.py
@@ -18,7 +18,7 @@ def run():
   m.setupGun()
   m.setupGenerator()
   # This is the actual test:
-  hit_tuple = DDG4.EventAction(kernel,'HitTupleAction/MiniTelTuple',True)
+  hit_tuple = DDG4.EventAction(m.kernel,'HitTupleAction/MiniTelTuple',True)
   hit_tuple.OutputFile = 'MiniTel_EnergyDeposits_'+time.strftime('%Y-%m-%d_%H-%M')+'.root'
   hit_tuple.Collections = ['*']
   m.kernel.eventAction().add(hit_tuple)
diff --git a/examples/ClientTests/scripts/MiniTelRegions.py b/examples/ClientTests/scripts/MiniTelRegions.py
index d9857a2d573c6181bfd0b50dec8b7400d1858c4f..5e19fe4d4044718606ee1e632f9bc0836cd659a2 100644
--- a/examples/ClientTests/scripts/MiniTelRegions.py
+++ b/examples/ClientTests/scripts/MiniTelRegions.py
@@ -7,6 +7,7 @@
 """
 if __name__ == "__main__":
   from MiniTelSetup import Setup as MiniTel
+  import logging
   m = MiniTel()
   m.configure()
   logging.info("#  Configure G4 geometry setup")
diff --git a/examples/ClientTests/scripts/MiniTelSetup.py b/examples/ClientTests/scripts/MiniTelSetup.py
index 192fc0390aea040b1ef33fc6339ee6f82b4f6eee..41d9c63f222617832c877175b332a08a928438e7 100644
--- a/examples/ClientTests/scripts/MiniTelSetup.py
+++ b/examples/ClientTests/scripts/MiniTelSetup.py
@@ -29,4 +29,4 @@ class Setup(DDG4TestSetup.Setup):
     return self
 
   def defineOutput(self,output='MiniTel_'+time.strftime('%Y-%m-%d_%H-%M')):
-    return DDG4TestSetup.Setup.configure(self,output)
+    return DDG4TestSetup.Setup.defineOutput(self,output)