diff --git a/bunsen/configure_fresh_system b/bunsen/configure_fresh_system
index e9934d4e..46feb368 100755
--- a/bunsen/configure_fresh_system
+++ b/bunsen/configure_fresh_system
@@ -7,8 +7,10 @@ sudo apt-get update
 sudo apt-get -y upgrade
 sudo apt-get -y --fix-missing install aptitude meld whois zsh tmux atop aria2 curl pv gajim tor torsocks nodejs icedove icedove-enigmail icedove-sogo-connector gajim lm-sensors freecad python3-pip meld whois curl pv tor torsocks nodejs npm terminator gsmartcontrol python-pip mercurial redshift gtk-redshift cmake intltool gparted wine solaar glances silversearcher-ag dkms linux-kernel-headers golang keepass2 libncurses5-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libatk1.0-dev libbonoboui2-dev libcairo2-dev libx11-dev libxpm-dev libxt-dev python-dev ruby-dev git retext kdiff3
 
-sudo systemctl enable tor
-sudo systemctl start tor
+if [[ -z $DONT_START_TOR]]; then
+	sudo systemctl enable tor
+	sudo systemctl start tor
+fi
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 DIR="$DIR/../"
diff --git a/bunsen/test b/bunsen/test
index fba3296a..534b9748 100755
--- a/bunsen/test
+++ b/bunsen/test
@@ -3,6 +3,9 @@
 set -e
 
 export DEBIAN_FRONTEND=noninteractive
+export DONT_CHANGE_SHELL
+export DONT_START_TOR
+
 apt-get update
 apt-get install sudo
 cd $HOME