diff --git a/Makefile b/Makefile
index 8976cdd11..e9d83c0c5 100644
--- a/Makefile
+++ b/Makefile
@@ -16,9 +16,12 @@ full:
 forcefull:
 	go install -a --tags=with_sqlite ./pkg/... ./server/camlistored ./cmd/... ./dev/...
 
-presubmit: fmt
+oldpresubmit: fmt
 	SKIP_DEP_TESTS=1 go test `pkg-config --libs sqlite3 1>/dev/null 2>/dev/null && echo "--tags=with_sqlite"` -short ./pkg/... ./server/camlistored/... ./server/appengine ./cmd/... ./dev/... && echo PASS
 
+presubmit: fmt
+	go run dev/devcam/*.go test -short
+
 embeds:
 	go install ./pkg/fileembed/genfileembed/ && genfileembed ./server/camlistored/ui && genfileembed ./pkg/server