diff --git a/src/main.py b/src/main.py
index e99af4d..a5c0a8e 100644
--- a/src/main.py
+++ b/src/main.py
@@ -225,6 +225,7 @@ try:
         def logout(self):
             if type(self.main_window.centralWidget) is Test:
                 self.main_window.centralWidget.change_recipe()
+                self.main_window.centralWidget.request_autotest("logout")
             Users.logout()
             self.main_window.admin_m.menuAction().setVisible(False)
             self.open_login()
diff --git a/src/ui/test/test.py b/src/ui/test/test.py
index 9b09730..311ac3e 100755
--- a/src/ui/test/test.py
+++ b/src/ui/test/test.py
@@ -113,7 +113,8 @@ class Test(Widget):
         self.autotesting_reason = None
         self.autotest_cycle_steps = None
         if "--no-autotest" not in sys.argv:
-            self.autotest_period = 12 * 60 * 60 * 1000
+            self.autotest_period = 8.5 * 60 * 60 * 1000 # 8.5 HOURS
+            # self.autotest_period = 12 * 60 * 60 * 1000 # 12 HOURS
             if not self.config["autotest_done"]:
                 self.request_autotest("init")
         else: