diff --git a/Makefile b/Makefile
index f4d6eb2f16..0baf001545 100644
--- a/Makefile
+++ b/Makefile
@@ -103,8 +103,14 @@ k8s-e2e: ## Run k8s specific e2e test
 		-args -v 5 -logtostderr true
 
 .PHONY: test-e2e
-test-e2e:
-	go run ./vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/openshift/*.go -alsologtostderr
+test-e2e: ## Run openshift specific e2e test
+	go test -timeout 60m \
+		-v ./vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e \
+		-kubeconfig $${KUBECONFIG:-~/.kube/config} \
+		-machine-api-namespace $${NAMESPACE:-openshift-machine-api} \
+		-ginkgo.v \
+		-args -v 5 -logtostderr true
+
 
 .PHONY: lint
 lint: ## Go lint your code