diff --git a/examples/CLICSiD/CMakeLists.txt b/examples/CLICSiD/CMakeLists.txt
index 11d89bc0771cfabf41c3e8a991af62874475a20c..f147b2bc6cecfe2f72e69f0abd3b6fc6555660a4 100644
--- a/examples/CLICSiD/CMakeLists.txt
+++ b/examples/CLICSiD/CMakeLists.txt
@@ -170,14 +170,14 @@ if (DD4HEP_USE_GEANT4)
     dd4hep_add_test_reg( CLICSiD_DDG4_${script}_as_AClick_LONGTEST
       COMMAND    "${CMAKE_INSTALL_PREFIX}/bin/run_test_CLICSiD.sh"
       EXEC_ARGS  root.exe -b -x -n -q -l "${DD4hep_ROOT}/examples/DDG4/examples/run.C(\"${CLICSiDEx_INSTALL}/scripts/${script}\")"
-      REGEX_PASS "UserEvent_1      INFO  Geant4TestEventAction> calling end.event_id=9"
+      REGEX_PASS "UserEvent_1      INFO  Geant4TestEventAction> calling end.event_id=2"
       REGEX_FAIL "EXCEPTION;ERROR;Error" )
     #
     # Execute identical source linked executable 
     dd4hep_add_test_reg( CLICSiD_DDG4_${script}_as_exe_LONGTEST
       COMMAND    "${CMAKE_INSTALL_PREFIX}/bin/run_test_CLICSiD.sh"
       EXEC_ARGS  ${script}
-      REGEX_PASS "UserEvent_1      INFO  Geant4TestEventAction> calling end.event_id=9"
+      REGEX_PASS "UserEvent_1      INFO  Geant4TestEventAction> calling end.event_id=2"
       REGEX_FAIL "EXCEPTION;ERROR;Error" )
   endforeach(script)
   #
diff --git a/examples/CLICSiD/scripts/CLICSiDAClick.C b/examples/CLICSiD/scripts/CLICSiDAClick.C
index d1a522409dbbef0ded7f56f284db37c41d9a2d57..1bc18b25931546bb2a1a0efc879360715066f748 100644
--- a/examples/CLICSiD/scripts/CLICSiDAClick.C
+++ b/examples/CLICSiD/scripts/CLICSiDAClick.C
@@ -56,7 +56,6 @@ int setupG4_CINT(bool interactive)  {
   kernel.loadGeometry(("file:"+det_dir+"/DDDetectors/compact/SiD.xml").c_str());
   kernel.loadXML(("file:"+install_dir+"/examples/CLICSiD/sim/field.xml").c_str());
 
-  kernel.property("NumEvents") = 10;
   if ( interactive )   {
     kernel.property("UI") = "UI";
     setPrintLevel(DEBUG);
@@ -67,6 +66,9 @@ int setupG4_CINT(bool interactive)  {
     ui["SessionType"] = "csh";
     kernel.registerGlobalAction(ui);
   }
+  else  {
+    kernel.property("NumEvents") = 3;
+  }
 
   GenAction gun(kernel,"Geant4ParticleGun/Gun");
   gun["energy"]       = 10*CLHEP::GeV;
diff --git a/examples/CLICSiD/scripts/CLICSiDXML.C b/examples/CLICSiD/scripts/CLICSiDXML.C
index d61d5b4ff84d6e1ca7b39d6c51ceb5fa0ff569ed..6952e2c27680fe3e346c9891a9cae399255ccc7a 100644
--- a/examples/CLICSiD/scripts/CLICSiDXML.C
+++ b/examples/CLICSiD/scripts/CLICSiDXML.C
@@ -40,10 +40,12 @@ int setupG4_XML(bool interactive)  {
   kernel.loadXML((prefix+"CLICSiD/sim/field.xml").c_str());
   kernel.loadXML((prefix+"CLICSiD/sim/sequences.xml").c_str());
   kernel.loadXML((prefix+"CLICSiD/sim/physics.xml").c_str());
-  kernel.property("NumEvents") = 10;
   if ( interactive )  {
     kernel.property("UI") = "UI";
   }
+  else   {
+    kernel.property("NumEvents") = 3;
+  }
   kernel.configure();
   kernel.initialize();
   kernel.run();
diff --git a/examples/LHeD/CMakeLists.txt b/examples/LHeD/CMakeLists.txt
index e30e22997f5729edb750811d08ba10bcca0dc103..609c8fb9353e201e0d3f8ca8a6b55ea70af384a0 100644
--- a/examples/LHeD/CMakeLists.txt
+++ b/examples/LHeD/CMakeLists.txt
@@ -107,7 +107,7 @@ if (DD4HEP_USE_GEANT4)
     dd4hep_add_test_reg( LHeD_DDG4_${script}_as_ACLick_LONGTEST
       COMMAND    "${CMAKE_INSTALL_PREFIX}/bin/run_test_LHeD.sh"
       EXEC_ARGS  root.exe -b -x -n -q -l "${LHeDEx_INSTALL}/scripts/run.C(\"${LHeDEx_INSTALL}/scripts/${script}\")"
-      REGEX_PASS "UserEvent_1      INFO  Geant4TestEventAction> calling end.event_id=9"
+      REGEX_PASS "UserEvent_1      INFO  Geant4TestEventAction> calling end.event_id=2"
       REGEX_FAIL "Exception;EXCEPTION;ERROR;Error" )
     set_property(TEST t_LHeD_DDG4_${script}_as_ACLick_LONGTEST PROPERTY RESOURCE_LOCK "INIT_ACLICK")
     #
@@ -115,7 +115,7 @@ if (DD4HEP_USE_GEANT4)
     dd4hep_add_test_reg( LHeD_DDG4_${script}_as_exe_LONGTEST
       COMMAND    "${CMAKE_INSTALL_PREFIX}/bin/run_test_LHeD.sh"
       EXEC_ARGS  ${script}
-      REGEX_PASS "UserEvent_1      INFO  Geant4TestEventAction> calling end.event_id=9"
+      REGEX_PASS "UserEvent_1      INFO  Geant4TestEventAction> calling end.event_id=2"
       REGEX_FAIL "Exception;EXCEPTION;ERROR;Error" )
   endforeach(script)
 endif()
diff --git a/examples/LHeD/scripts/LHeDACLick.C b/examples/LHeD/scripts/LHeDACLick.C
index c85d3f2b099e4467d3e4b62dda68722dce3aef82..d9d203f32058f213fd33b64274780c290bd4fba6 100644
--- a/examples/LHeD/scripts/LHeDACLick.C
+++ b/examples/LHeD/scripts/LHeDACLick.C
@@ -59,7 +59,9 @@ int setupG4_CINT(bool interactive)  {
     ui["SessionType"] = "csh";
     kernel.registerGlobalAction(ui);
   }
-
+  else   {
+    kernel.property("NumEvents") = 3;
+  }
   GenAction gun(kernel,"Geant4ParticleGun/Gun");
   gun["energy"]       = 10*CLHEP::GeV;
   gun["particle"]     = "e-";
diff --git a/examples/LHeD/scripts/LHeDXML.C b/examples/LHeD/scripts/LHeDXML.C
index 10b6b881eb1d4d2f471a374a533cc4c710cf8fe1..73f5b0323567a42fb8cd6edb3ede4e4e85d06ac5 100644
--- a/examples/LHeD/scripts/LHeDXML.C
+++ b/examples/LHeD/scripts/LHeDXML.C
@@ -37,6 +37,9 @@ int setupG4_XML(bool interactive)  {
   if ( interactive )  {
     kernel.property("UI") = "UI";
   }
+  else  {
+    kernel.property("NumEvents") = 3;
+  }
   kernel.configure();
   kernel.initialize();
   kernel.run();
diff --git a/examples/OpticalTracker/scripts/richsim.py b/examples/OpticalTracker/scripts/richsim.py
index b371ce3a964c74fe58306fa30d01a92e4416e57e..3eaefd0a43f4ce17e8128a65ebd85bd2f55446a3 100755
--- a/examples/OpticalTracker/scripts/richsim.py
+++ b/examples/OpticalTracker/scripts/richsim.py
@@ -62,7 +62,7 @@ if __name__ == "__main__":
     SIM.part.userParticleHandler = ""
 
     # Particle gun settings: pions with fixed energy and theta, varying phi
-    SIM.numberOfEvents = 500
+    SIM.numberOfEvents = 100
     SIM.enableGun = True
     SIM.gun.energy = "40*GeV"
     SIM.gun.particle = "pi+"