diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..da69f2b7
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,27 @@
+venv=.venv
+with_venv=source $(venv)/bin/activate
+installed=$(venv)/lib/python2.6/site-packages
+twisted=$(installed)/twisted/__init__.py
+
+
+test: python-dependencies $(twisted)
+	$(with_venv) && python run_tests.py
+
+clean:
+	rm -rf _trial_temp
+	rm -rf keys
+	rm -rf instances
+	rm -rf networks
+
+clean-all: clean
+	rm -rf $(venv)
+
+python-dependencies: $(venv)
+	pip install -q -E $(venv) -r tools/pip-requires
+
+$(venv):
+	pip install -q virtualenv
+	virtualenv -q --no-site-packages $(venv)
+
+$(twisted):
+	pip install -q -E $(venv) http://nova.openstack.org/Twisted-10.0.0Nova.tar.gz
diff --git a/tools/pip-requires b/tools/pip-requires
new file mode 100644
index 00000000..edb5fc01
--- /dev/null
+++ b/tools/pip-requires
@@ -0,0 +1,14 @@
+IPy==0.70
+M2Crypto==0.20.2
+amqplib==0.6.1
+anyjson==0.2.4
+boto==2.0b1
+carrot==0.10.5
+lockfile==0.8
+mox==0.5.0
+python-daemon==1.5.5
+python-gflags==1.3
+redis==2.0.0
+tornado==1.0
+wsgiref==0.1.2
+zope.interface==3.6.1