diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..d7b29de490785be79058754086da088853d96530
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,11 @@
+.PHONY: clean
+clean:
+	rm *.itp* *.gro* *.dat* *.json* *.xtc* | true
+	rm -r *.ff | true
+
+.PHONY: test
+test:
+	py.test test/
+
+.PHONY: check
+check: test
diff --git a/clean.sh b/clean.sh
deleted file mode 100755
index f257ab02ccf1cd3e12f5be6d6435b99ed9793fa9..0000000000000000000000000000000000000000
--- a/clean.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-rm *.itp* *.gro* *.dat* *.json* *.xtc*
-rm -r *.ff