diff --git a/Makefile b/Makefile
index 99f742444..f57cdf1a8 100644
--- a/Makefile
+++ b/Makefile
@@ -73,6 +73,11 @@ SHELL = /usr/bin/env bash -o pipefail
 # Extra vars which will be passed to the Docker-build
 DOCKER_BUILD_ARGS ?=
 
+# Ginkgo args
+GINKGO_REPEAT = --repeat 5
+GINKGO_RAND_ALL = --randomize-all
+GINKGO_CI_ARGS ?= $(GINKGO_REPEAT) $(GINKGO_RAND_ALL) --no-color
+
 .PHONY: all
 all: build
 
@@ -170,6 +175,10 @@ golangci-lint:
 .PHONY: test
 test: manifests generate gowork fmt vet envtest ginkgo ginkgo-run ## Run ginkgo tests with dependencies.
 
+.PHONY: test-ci
+test-ci: GINKGO_ARGS = $(GINKGO_CI_ARGS)
+test-ci: manifests generate gowork fmt vet envtest ginkgo ginkgo-run ## Run ginkgo tests with dependencies.
+
 .PHONY: ginkgo-run
 ginkgo-run: ## Run ginkgo.
 	source hack/export_related_images.sh && \