diff --git a/xos/configurations/test/Dockerfile.test b/xos/configurations/test/Dockerfile.test
new file mode 100644
index 0000000..2f81553
--- /dev/null
+++ b/xos/configurations/test/Dockerfile.test
@@ -0,0 +1,5 @@
+ADD /root/setup/admin-openrc.sh /root/setup/
+ADD .,/common/flat_net_name /root/setup/
+ADD ../common/cloudlab-nods.yaml /opt/xos/configurations/commmon/
+
+CMD ["/bin/bash"]
diff --git a/xos/configurations/test/Makefile b/xos/configurations/test/Makefile
new file mode 100644
index 0000000..1e203a2
--- /dev/null
+++ b/xos/configurations/test/Makefile
@@ -0,0 +1,9 @@
+MYIP=`hostname -i`
+
+test: common_cloudlab
+	cat ../common/Dockerfile.common Dockerfile.test > Dockerfile
+	cd ../../..; sudo docker build -t xos -f xos/configurations/test/Dockerfile .
+	sudo docker run -d --add-host="ctl:$(MYIP)" -p 9999:8000 xos
+
+common_cloudlab:
+	make -C ../common -f Makefile.cloudlab