diff --git a/bunsen/configure_fresh_system b/bunsen/configure_fresh_system
index c4e9bc8d..60820f23 100755
--- a/bunsen/configure_fresh_system
+++ b/bunsen/configure_fresh_system
@@ -14,7 +14,7 @@ done
 set -e
 eval $install_packages
 
-if [[ -z $DONT_START_TOR ]]; then
+if [[ -z $NO_SYSTEMCTL ]]; then
 	sudo systemctl enable tor
 	sudo systemctl start tor
 fi
diff --git a/bunsen/test_insider b/bunsen/test_insider
index d1612fb6..8e653f4d 100755
--- a/bunsen/test_insider
+++ b/bunsen/test_insider
@@ -4,7 +4,7 @@ set -e
 
 export DEBIAN_FRONTEND=noninteractive
 export DONT_CHANGE_SHELL=true
-export DONT_START_TOR=true
+export NO_SYSTEMCTL=true
 
 echo "APT::Acquire::Retries=16;" >> /etc/apt/apt.conf.d/99_retries
 
diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system
index 0fdee57a..b7089cd7 100755
--- a/fedora/configure_fresh_system
+++ b/fedora/configure_fresh_system
@@ -19,11 +19,11 @@ set +e
 sudo diff /etc/dnf/automatic.conf.bak /etc/dnf/automatic.conf
 set -e
 
-sudo systemctl enable dnf-automatic.timer
-sudo systemctl start  dnf-automatic.timer
-sudo systemctl list-timers "*dnf-*"
+if [[ -z $NO_SYSTEMCTL ]]; then
+    sudo systemctl enable dnf-automatic.timer
+    sudo systemctl start  dnf-automatic.timer
+    sudo systemctl list-timers "*dnf-*"
 
-if [[ -z $DONT_START_TOR ]]; then
     sudo systemctl enable tor
     sudo systemctl start tor
 fi
diff --git a/fedora/test_insider b/fedora/test_insider
index 496329b8..e31efca7 100755
--- a/fedora/test_insider
+++ b/fedora/test_insider
@@ -3,7 +3,7 @@
 set -e
 
 export DONT_CHANGE_SHELL=true
-export DONT_START_TOR=true
+export NO_SYSTEMCTL=true
 
 dnf -y install sudo
 
diff --git a/ubuntu/configure_fresh_system b/ubuntu/configure_fresh_system
index 06a7e31a..ec8b0a9b 100755
--- a/ubuntu/configure_fresh_system
+++ b/ubuntu/configure_fresh_system
@@ -15,7 +15,7 @@ done
 set -e
 eval $install_packages
 
-if [[ -z $DONT_START_TOR ]]; then
+if [[ -z $NO_SYSTEMCTL ]]; then
 	sudo systemctl enable tor
 	sudo systemctl start tor
 fi
diff --git a/ubuntu/test_insider b/ubuntu/test_insider
index 55aa9929..1234fce0 100755
--- a/ubuntu/test_insider
+++ b/ubuntu/test_insider
@@ -4,7 +4,7 @@ set -e
 
 export DEBIAN_FRONTEND=noninteractive
 export DONT_CHANGE_SHELL=true
-export DONT_START_TOR=true
+export NO_SYSTEMCTL=true
 
 echo "APT::Acquire::Retries=16;" >> /etc/apt/apt.conf.d/99_retries