diff --git a/master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.SlapOSTestCaseMixin.py b/master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.SlapOSTestCaseMixin.py
index 04bead535eb77e51a902778409dfa4eb1a7aefad..fe8a07241712c29d0ee8a584e8a78ae0c1561094 100644
--- a/master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.SlapOSTestCaseMixin.py
+++ b/master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.SlapOSTestCaseMixin.py
@@ -666,35 +666,23 @@ return %s""" % (script_name, fake_return ))
       self.portal.portal_skins.custom.manage_delObjects(script_name)
     transaction.commit()
 
-  def assertScriptVisited(self, document, script_name):
-    self.assertEqual(
-        'Visited by %s' % script_name,
-        document.workflow_history['edit_workflow'][-1]['comment'])
-
-  def assertScriptNotVisited(self, document, script_name):
-    self.assertNotEqual(
-        'Visited by %s' % script_name,
-        document.workflow_history['edit_workflow'][-1]['comment'])
-
   def _test_alarm(self, alarm, document, script_name):
     self.tic()
-    self._simulateScript(script_name)
-    try:
+    with TemporaryAlarmScript(self.portal, script_name):
       alarm.activeSense()
       self.tic()
-    finally:
-      self._dropScript(script_name)
-    self.assertScriptVisited(document, script_name)
+    self.assertEqual(
+        'Visited by %s' % script_name,
+        document.workflow_history['edit_workflow'][-1]['comment'])
 
   def _test_alarm_not_visited(self, alarm, document, script_name):
     self.tic()
-    self._simulateScript(script_name)
-    try:
+    with TemporaryAlarmScript(self.portal, script_name):
       alarm.activeSense()
       self.tic()
-    finally:
-      self._dropScript(script_name)
-    self.assertScriptNotVisited(document, script_name)
+    self.assertNotEqual(
+        'Visited by %s' % script_name,
+        document.workflow_history['edit_workflow'][-1]['comment'])
 
   def restoreAccountingTemplatesOnPreferences(self):
     self.login()