diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000..d3183f0f5
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,12 @@
+
+.PHONY: run-queen run-client test
+
+run-queen:
+	cd queen-basedir && PYTHONPATH=.. twistd -noy ../queen.tac
+
+run-client:
+	cd client-basedir && PYTHONPATH=.. twistd -noy ../client.tac
+
+test:
+	trial allmydata
+