diff --git a/test/endtoend/operator/101_initial_cluster.yaml b/test/endtoend/operator/101_initial_cluster.yaml
index 76e9d340..681d541d 100644
--- a/test/endtoend/operator/101_initial_cluster.yaml
+++ b/test/endtoend/operator/101_initial_cluster.yaml
@@ -56,7 +56,7 @@ spec:
           cpu: 100m
           memory: 128Mi
       extraFlags:
-        recovery-period-block-duration: 5s
+        instance-poll-time: 3s
     partitionings:
     - equal:
         parts: 1
diff --git a/test/endtoend/operator/101_initial_cluster_autoscale.yaml b/test/endtoend/operator/101_initial_cluster_autoscale.yaml
index 1cff8c25..4ec46e53 100644
--- a/test/endtoend/operator/101_initial_cluster_autoscale.yaml
+++ b/test/endtoend/operator/101_initial_cluster_autoscale.yaml
@@ -56,7 +56,7 @@ spec:
           cpu: 100m
           memory: 128Mi
       extraFlags:
-        recovery-period-block-duration: 5s
+        instance-poll-time: 3s
     partitionings:
     - equal:
         parts: 1
diff --git a/test/endtoend/operator/101_initial_cluster_backup.yaml b/test/endtoend/operator/101_initial_cluster_backup.yaml
index 66bc4d8d..b9f5bc5b 100644
--- a/test/endtoend/operator/101_initial_cluster_backup.yaml
+++ b/test/endtoend/operator/101_initial_cluster_backup.yaml
@@ -63,7 +63,7 @@ spec:
           cpu: 100m
           memory: 128Mi
       extraFlags:
-        recovery-period-block-duration: 5s
+        instance-poll-time: 3s
     partitionings:
     - equal:
         parts: 1
diff --git a/test/endtoend/operator/101_initial_cluster_backup_schedule.yaml b/test/endtoend/operator/101_initial_cluster_backup_schedule.yaml
index 8f3018b7..a75f6f09 100644
--- a/test/endtoend/operator/101_initial_cluster_backup_schedule.yaml
+++ b/test/endtoend/operator/101_initial_cluster_backup_schedule.yaml
@@ -94,7 +94,7 @@ spec:
           cpu: 100m
           memory: 128Mi
       extraFlags:
-        recovery-period-block-duration: 5s
+        instance-poll-time: 3s
     partitionings:
     - equal:
         parts: 1
diff --git a/test/endtoend/operator/101_initial_cluster_unmanaged_tablet.yaml b/test/endtoend/operator/101_initial_cluster_unmanaged_tablet.yaml
index 77d6beef..241e28f6 100644
--- a/test/endtoend/operator/101_initial_cluster_unmanaged_tablet.yaml
+++ b/test/endtoend/operator/101_initial_cluster_unmanaged_tablet.yaml
@@ -57,7 +57,7 @@ spec:
           cpu: 10m
           memory: 64Mi
       extraFlags:
-        recovery-period-block-duration: 5s
+        instance-poll-time: 3s
     partitionings:
     - equal:
         parts: 1
diff --git a/test/endtoend/operator/201_customer_tablets.yaml b/test/endtoend/operator/201_customer_tablets.yaml
index bd9145f4..c012a911 100644
--- a/test/endtoend/operator/201_customer_tablets.yaml
+++ b/test/endtoend/operator/201_customer_tablets.yaml
@@ -52,7 +52,7 @@ spec:
           cpu: 100m
           memory: 128Mi
       extraFlags:
-        recovery-period-block-duration: 5s
+        instance-poll-time: 3s
     partitionings:
     - equal:
         parts: 1
@@ -96,7 +96,7 @@ spec:
           cpu: 100m
           memory: 128Mi
       extraFlags:
-        recovery-period-block-duration: 5s
+        instance-poll-time: 3s
     partitionings:
     - equal:
         parts: 1
diff --git a/test/endtoend/operator/302_new_shards.yaml b/test/endtoend/operator/302_new_shards.yaml
index f6f62788..0c6e6b41 100644
--- a/test/endtoend/operator/302_new_shards.yaml
+++ b/test/endtoend/operator/302_new_shards.yaml
@@ -52,7 +52,7 @@ spec:
           cpu: 100m
           memory: 128Mi
       extraFlags:
-        recovery-period-block-duration: 5s
+        instance-poll-time: 3s
     partitionings:
     - equal:
         parts: 1
@@ -96,7 +96,7 @@ spec:
           cpu: 100m
           memory: 128Mi
       extraFlags:
-        recovery-period-block-duration: 5s
+        instance-poll-time: 3s
     partitionings:
     - equal:
         parts: 1
diff --git a/test/endtoend/operator/306_down_shard_0.yaml b/test/endtoend/operator/306_down_shard_0.yaml
index ca620841..1da56e1a 100644
--- a/test/endtoend/operator/306_down_shard_0.yaml
+++ b/test/endtoend/operator/306_down_shard_0.yaml
@@ -51,7 +51,7 @@ spec:
           cpu: 100m
           memory: 128Mi
       extraFlags:
-        recovery-period-block-duration: 5s
+        instance-poll-time: 3s
     turndownPolicy: Immediate
     partitionings:
     - equal:
@@ -91,7 +91,7 @@ spec:
           cpu: 100m
           memory: 128Mi
       extraFlags:
-        recovery-period-block-duration: 5s
+        instance-poll-time: 3s
     turndownPolicy: Immediate
     partitionings:
     - equal:
diff --git a/test/endtoend/operator/cluster_autoscale.yaml b/test/endtoend/operator/cluster_autoscale.yaml
index aad442ab..9afb6f74 100644
--- a/test/endtoend/operator/cluster_autoscale.yaml
+++ b/test/endtoend/operator/cluster_autoscale.yaml
@@ -66,7 +66,7 @@ spec:
           cpu: 100m
           memory: 128Mi
       extraFlags:
-        recovery-period-block-duration: 5s
+        instance-poll-time: 3s
     partitionings:
     - equal:
         parts: 1
diff --git a/test/endtoend/operator/cluster_upgrade.yaml b/test/endtoend/operator/cluster_upgrade.yaml
index 2aa0e229..27d5c872 100644
--- a/test/endtoend/operator/cluster_upgrade.yaml
+++ b/test/endtoend/operator/cluster_upgrade.yaml
@@ -56,7 +56,7 @@ spec:
           cpu: 100m
           memory: 128Mi
       extraFlags:
-        recovery-period-block-duration: 5s
+        instance-poll-time: 3s
     partitionings:
     - equal:
         parts: 1