diff --git a/Makefile b/Makefile
index f19fe3742..4cb208199 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,13 @@
 
 test:
 	go test
-	$(MAKE) -C cmd/khepri
-	test/run.sh cmd/khepri/khepri
+	for dir in cmd/* ; do \
+		(cd "$$dir"; go build) \
+	done
+	test/run.sh cmd/khepri/khepri cmd/dirdiff/dirdiff
 
 clean:
 	go clean
-	$(MAKE) -C cmd/khepri test
+	for dir in cmd/* ; do \
+		(cd "$$dir"; go clean) \
+	done
diff --git a/cmd/khepri/Makefile b/cmd/khepri/Makefile
deleted file mode 100644
index d1d610c91..000000000
--- a/cmd/khepri/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-.PHONY: clean all test
-
-test:
-	go build
-
-clean:
-	go clean