diff --git a/xos/configurations/test/Makefile.inside b/xos/configurations/test/Makefile.inside
index 2b24270..9b5ed4b 100644
--- a/xos/configurations/test/Makefile.inside
+++ b/xos/configurations/test/Makefile.inside
@@ -1,4 +1,12 @@
-run_tests:
+all: setup_xos run_tests
+
+setup_xos:
 	bash /opt/xos/scripts/docker_setup_xos
+	python /opt/xos/tosca/run.py padmin@vicci.org /opt/xos/configurations/common/cloudlab.yaml
+	python /opt/xos/tosca/run.py padmin@vicci.org /opt/xos/configurations/common/cloudlab-nodes.yaml
+	echo sleeping 30 seconds
+	sleep 30
+
+run_tests:
 	supervisorctl stop observer
 	cd /opt/xos/tosca/tests; python ./alltests.py