diff --git a/Makefile b/Makefile
index 55e8850c..8952a902 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ fmt:
 test:
 	GO111MODULE=off go get github.com/onsi/ginkgo/ginkgo
 	GO111MODULE=off go get github.com/onsi/gomega/...
-	ginkgo -race -r ./...
+	ginkgo -race -r -flakeAttempts 3 ./...
 
 .PHONY: test-integration
 test-integration:
diff --git a/scripts/ginkgo.coverage.sh b/scripts/ginkgo.coverage.sh
index 9a747531..7a5bd0c5 100755
--- a/scripts/ginkgo.coverage.sh
+++ b/scripts/ginkgo.coverage.sh
@@ -23,7 +23,7 @@ coveragetxt="coverage.txt"
 
 
 generate_cover_data() {
-  ginkgo -failFast -cover -r .
+  ginkgo -flakeAttempts=3 -race -failFast -cover -r .
   echo "" > ${coveragetxt}
   find . -type f -name "*.coverprofile" | while read -r file;  do cat "$file" >> ${coveragetxt} && mv "$file" "${coverdir}"; done
   echo "mode: $covermode" >"$profile"