diff --git a/hack/tools/ensure-kind.sh b/hack/tools/ensure-kind.sh
index aa4585fee..2e15e22eb 100755
--- a/hack/tools/ensure-kind.sh
+++ b/hack/tools/ensure-kind.sh
@@ -21,6 +21,6 @@
 # TODO: consider enforcing a particular version locally as well to avoid confusion
 if ! command -v kind; then
     local repo_gobin="${REPO_ROOT}/_bin"
-    GOBIN="${repo_gobin}" go install sigs.k8s.io/kind@v0.25.0
+    GOBIN="${repo_gobin}" go install sigs.k8s.io/kind@v0.30.0
     export PATH="${repo_gobin}:${PATH}"
 fi
diff --git a/pkg/pj-on-kind.sh b/pkg/pj-on-kind.sh
index a145ab8d0..3cd792ac8 100755
--- a/pkg/pj-on-kind.sh
+++ b/pkg/pj-on-kind.sh
@@ -84,9 +84,9 @@ function ensureInstall() {
     echo "Installing kind..."
     if [[ $go_minor_version -ge 18 ]]; then
       # `go get` is fully deprecated in Go 1.18, so use `go install` for version >= 18.
-      GO111MODULE="on" go install sigs.k8s.io/kind@v0.17.0
+      GO111MODULE="on" go install sigs.k8s.io/kind@v0.30.0
     else
-      GO111MODULE="on" go get sigs.k8s.io/kind@v0.17.0
+      GO111MODULE="on" go get sigs.k8s.io/kind@v0.30.0
     fi
   fi
   local found="false"
diff --git a/test/integration/test/deck_test.go b/test/integration/test/deck_test.go
index 03270bab5..3615f9543 100644
--- a/test/integration/test/deck_test.go
+++ b/test/integration/test/deck_test.go
@@ -274,7 +274,7 @@ func TestDeckTenantIDs(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
-			//Give them new names to prevent conflict
+			// Give them new names to prevent conflict
 			name := RandomString(t)
 			prowjobs := renamePJs(tt.prowjobs, name)
 			expected := renamePJs(tt.expected, name)
@@ -504,11 +504,19 @@ func TestRerun(t *testing.T) {
 	if !passed {
 		t.Fatal("Expected updated job.")
 	}
-
+	passed = false
 	// Deck scheduled job from latest configuration, rerun with "original"
 	// should still go with original configuration.
-	rerun(t, jobToRerun.Name, "original")
-	if latestRun := getLatestJob(t, jobName, &latestRun.CreationTimestamp); latestRun.Labels["foo"] != "foo" {
+	// check every 30s interval three times for it update
+	for i := 0; i < 3; i++ {
+		time.Sleep(30 * time.Second)
+		rerun(t, jobToRerun.Name, "original")
+		if latestRun = getLatestJob(t, jobName, &latestRun.CreationTimestamp); latestRun.Labels["foo"] == "foo" {
+			passed = true
+			break
+		}
+	}
+	if !passed {
 		t.Fatalf("Job label mismatch. Want: 'foo', got: '%s'", latestRun.Labels["foo"])
 	}
 }