diff --git a/test b/test
index a1ffffb6..3ca2a066 100755
--- a/test
+++ b/test
@@ -5,8 +5,6 @@ if [[ -z $DETECTED_OS ]]; then
     exit 1
 fi
 
-DIR=$DETECTED_OS
-
 if [[ $DETECTED_OS =~ .*:.* ]]; then
    DIR=`echo $DETECTED_OS | cut -d':' -f1` 
 else
@@ -14,5 +12,12 @@ else
     exit 1
 fi
 
-docker run -v `pwd`:/root/temp/dotfiles/ $DETECTED_OS /root/temp/dotfiles/$DIR/test_insider
+INSIDER_ROOT_DIR=/root/temp/dotfiles/
+CURRENT_DIR=`pwd`
+
+if [[ -d "$CURRENT_DIR/$DETECTED_OS" ]]; then
+    DIR=$DETECTED_OS
+fi
+
+docker run -v $CURRENT_DIR:$INSIDER_ROOT_DIR $DETECTED_OS $INSIDER_ROOT_DIR/$DIR/test_insider
 
diff --git a/ubuntu:trusty/configure_fresh_system b/ubuntu:trusty/configure_fresh_system
new file mode 100755
index 00000000..4941514f
--- /dev/null
+++ b/ubuntu:trusty/configure_fresh_system
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -e
+set -v
+
+sudo apt-get update
+sudo apt-get -y upgrade
+install_packages="sudo apt-get -y --fix-missing install apt-file aptitude aria2 atop cmake curl dkms freecad gajim git glances gnupg2 golang gparted gsmartcontrol gtk-redshift intltool kdiff3 keepass2 libatk1.0-dev libbonoboui2-dev libcairo2-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libncurses5-dev libx11-dev libxpm-dev libxt-dev linux-kernel-headers lm-sensors meld mercurial nodejs npm pv python-dev python-pip python3-pip realpath redshift retext ruby-dev silversearcher-ag terminator thunderbird thunderbird-enigmail tmux tor torsocks vim whois zsh"
+
+set +e
+for i in `seq 1 3`; do
+        eval $install_packages
+done
+
+set -e
+eval $install_packages
+
+if [[ -z $NO_SYSTEMCTL ]]; then
+	sudo systemctl enable tor
+	sudo systemctl start tor
+fi
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DIR="$DIR/../"
+DIR="$DIR" $DIR/common/configure_fresh_system