diff --git a/cleanup.sh b/cleanup.sh
new file mode 100755
index 0000000..fd0d7cc
--- /dev/null
+++ b/cleanup.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -ue
+
+# Cleanup emacs backups
+find . -name '*~' -delete
+
+# Cleanup hanging test dirs
+find . -regextype egrep -regex './[0-9a-f-]{36}/?.*' -delete