diff --git a/Makefile b/Makefile
deleted file mode 100644
index 847da779f7a1..000000000000
--- a/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-venv=.nova-venv
-with_venv=tools/with_venv.sh
-
-build:
-	# Nothing to do
-
-default_test_type:= $(shell if [ -e $(venv) ]; then echo venv; else echo system; fi)
-
-test: test-$(default_test_type)
-
-test-venv: $(venv)
-	$(with_venv) python run_tests.py
-
-test-system:
-	python run_tests.py
-
-clean:
-	rm -rf _trial_temp
-	rm -rf keys
-	rm -rf instances
-	rm -rf networks
-	rm -f run_tests.err.log
-
-clean-all: clean
-	rm -rf $(venv)
-
-MANIFEST.in:
-	[ -d .bzr ] || (echo "Must be a bzr checkout" ; exit 1)
-	bzr ls --kind=file -VR | while read f; do echo include "$$f"; done > $@
-
-sdist: MANIFEST.in
-	python setup.py sdist
-
-$(venv):
-	@echo "You need to install the Nova virtualenv before you can run this."
-	@echo ""
-	@echo "Please run tools/install_venv.py"
-	@exit 1
-
-.PHONY: MANIFEST.in
diff --git a/run_tests.sh b/run_tests.sh
new file mode 100644
index 000000000000..1bf3d1a791d0
--- /dev/null
+++ b/run_tests.sh
@@ -0,0 +1,13 @@
+#!/bin/bash 
+
+venv=.nova-venv
+with_venv=tools/with_venv.sh
+
+if [ -e ${venv} ]; then
+  ${with_venv} python run_tests.py
+else  
+  echo "You need to install the Nova virtualenv before you can run this."
+  echo ""
+  echo "Please run tools/install_venv.py"
+  exit 1
+fi