diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml
index 44e8d92628..10797bd5aa 100644
--- a/.github/workflows/test-build-deploy.yml
+++ b/.github/workflows/test-build-deploy.yml
@@ -54,7 +54,11 @@ jobs:
           mkdir -p /go/src/github.com/cortexproject/cortex
           ln -s $GITHUB_WORKSPACE/* /go/src/github.com/cortexproject/cortex
       - name: Run Tests
-        run: make BUILD_IN_CONTAINER=false test
+        run: |
+          for run in $(seq 1 3); do
+            make BUILD_IN_CONTAINER=false test && break
+            echo "Retrying tests... Run $run failed."
+          done
 
   security:
     name: CodeQL
@@ -193,7 +197,10 @@ jobs:
           export CORTEX_IMAGE="${CORTEX_IMAGE_PREFIX}cortex:$IMAGE_TAG-amd64"
           export CORTEX_CHECKOUT_DIR="/go/src/github.com/cortexproject/cortex"
           echo "Running integration tests with image: $CORTEX_IMAGE"
-          go test -tags=integration,${{ matrix.tags }} -timeout 2400s -v -count=1 ./integration/...
+          for run in $(seq 1 3); do
+            go test -tags=integration,${{ matrix.tags }} -timeout 2400s -v -count=1 -failfast ./integration/... && break
+            echo "Retrying tests... Run $run failed."
+          done
         env:
           IMAGE_PREFIX: ${{ secrets.IMAGE_PREFIX }}
 
diff --git a/Makefile b/Makefile
index 7c0c10a337..b7287897dd 100644
--- a/Makefile
+++ b/Makefile
@@ -223,7 +223,7 @@ lint:
 		./pkg/ruler/...
 
 test:
-	go test -tags netgo -timeout 30m -race -count 1 ./...
+	go test -tags netgo -timeout 30m -race -failfast -count 1 ./...
 
 cover:
 	$(eval COVERDIR := $(shell mktemp -d coverage.XXXXXXXXXX))