diff --git a/Build.mak b/Build.mak
index 80693b8..040373d 100644
--- a/Build.mak
+++ b/Build.mak
@@ -12,12 +12,25 @@ endif
 download-mnist: $C/script/download-mnist
 	$(call exec,sh $(if $V,,-x) $^,$(MNIST_DATA_DIR),$^)
 
+# helper function to run tests
+run_test = $(call exec,MXNET_ENGINE_TYPE=$2 $1,$1,$2)
+
 # extra build dependencies for integration tests
 $O/test-mxnet: override LDFLAGS += -lz
 $O/test-mxnet: override DFLAGS += -debug=MXNetHandleManualFree
 
 # extra runtime dependencies for integration tests
 $O/test-mxnet.stamp: override ITFLAGS += $(MNIST_DATA_DIR)
-$O/test-mxnet.stamp: download-mnist
+$O/test-mxnet.stamp: $O/test-mxnet download-mnist
+	$(call run_test,$<,NaiveEngine)
+	$(call run_test,$<,ThreadedEngine)
+	$(call run_test,$<,ThreadedEnginePerDevice)
+	$Vtouch $@
 
 $O/%unittests: override LDFLAGS += -lz
+
+$O/allunittests.stamp: $O/allunittests
+	$(call run_test,$<,NaiveEngine)
+	$(call run_test,$<,ThreadedEngine)
+	$(call run_test,$<,ThreadedEnginePerDevice)
+	$Vtouch $@