diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 467709df0..3f1b4ae40 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -191,6 +191,10 @@ jobs:
   network-upgrade-names:
     runs-on: upgrade-tester
     steps:
+      - name: Cleanup build folder
+        run: |
+          sudo rm -rf ./* || true
+          sudo rm -rf ./.??* || true
       - uses: actions/checkout@v4
       - run: git fetch --prune --unshallow
       - name: Detect required Go version
@@ -220,6 +224,10 @@ jobs:
   network-upgrade:
     runs-on: upgrade-tester
     steps:
+      - name: Cleanup build folder
+        run: |
+          sudo rm -rf ./* || true
+          sudo rm -rf ./.??* || true
       - uses: actions/checkout@v4
       - run: git fetch --prune --unshallow
       - name: Detect required Go version
diff --git a/make/test-upgrade.mk b/make/test-upgrade.mk
index 1d6c3c2a8..645ea87b1 100644
--- a/make/test-upgrade.mk
+++ b/make/test-upgrade.mk
@@ -34,7 +34,7 @@ genesis: $(GENESIS_DEST)
 
 .PHONY: test
 test: $(COSMOVISOR) init
-	$(GO_TEST) -run "^\QTestUpgrade\E$$" -tags e2e.upgrade -timeout 60m -v -args \
+	$(GO_TEST) -run "^\QTestUpgrade\E$$" -tags e2e.upgrade -timeout 180m -v -args \
 		-cosmovisor=$(COSMOVISOR) \
 		-workdir=$(AP_RUN_DIR)/validators \
 		-config=test-config.json \