diff --git a/src/eideticker/eideticker/device.py b/src/eideticker/eideticker/device.py
index ae22c4d..d0463a8 100644
--- a/src/eideticker/eideticker/device.py
+++ b/src/eideticker/eideticker/device.py
@@ -468,6 +468,10 @@ marionetteScriptFinished();
         self._logger.info("Unlocking screen...")
         self.gaiaDevice.unlock()
 
+    def killApps(self):
+        self._logger.info("Killing all running apps...")
+        self.gaiaApps.kill_all()
+
 
 class B2GADB(EidetickerB2GMixin, mozdevice.DeviceManagerADB):
     def __init__(self, **kwargs):
diff --git a/src/eideticker/eideticker/runtest.py b/src/eideticker/eideticker/runtest.py
index b9614c5..ab2b892 100644
--- a/src/eideticker/eideticker/runtest.py
+++ b/src/eideticker/eideticker/runtest.py
@@ -34,6 +34,8 @@ def prepare_test(testkey, device_prefs):
 
         logger.info("Restarting b2g")
         device.startB2G()
+        device.unlock()
+        device.killApps()
 
         if hasattr(test, 'prepare_app'):
             logger.info("Doing initial setup on app for test")