diff --git a/NodeBase/selenium.conf b/NodeBase/selenium.conf
index 77bc5f82c..7d8dfe9af 100644
--- a/NodeBase/selenium.conf
+++ b/NodeBase/selenium.conf
@@ -5,8 +5,8 @@
 [program:xvfb]
 priority=0
 command=/opt/bin/start-xvfb.sh
-autostart=true
-autorestart=true
+autostart=%(ENV_SE_START_XVFB)s
+autorestart=%(ENV_SE_START_XVFB)s
 killasgroup=true
 
 ;Logs
@@ -23,8 +23,8 @@ stderr_capture_maxbytes=50MB
 [program:vnc]
 priority=5
 command=/opt/bin/start-vnc.sh
-autostart=true
-autorestart=true
+autostart=%(ENV_SE_START_VNC)s
+autorestart=%(ENV_SE_START_VNC)s
 killasgroup=true
 
 ;Logs
@@ -41,8 +41,8 @@ stderr_capture_maxbytes=50MB
 [program:novnc]
 priority=10
 command=/opt/bin/start-novnc.sh
-autostart=true
-autorestart=true
+autostart=%(ENV_SE_START_NO_VNC)s
+autorestart=%(ENV_SE_START_NO_VNC)s
 killasgroup=true
 
 ;Logs
diff --git a/tests/AutoscalingTests/common.py b/tests/AutoscalingTests/common.py
index 28dd18208..b178d0c10 100644
--- a/tests/AutoscalingTests/common.py
+++ b/tests/AutoscalingTests/common.py
@@ -79,7 +79,8 @@ def randomly_quit_sessions(sessions, sublist_size):
             session.quit()
             sessions.remove(session)
         print(f"QUIT: {len(sessions_to_quit)} sessions have been randomly quit.")
-    return len(sessions_to_quit)
+        return len(sessions_to_quit)
+    return 0
 
 def get_result_file_name():
     return f"tests/autoscaling_results"