diff --git a/test/e2e/aws-ebs/ocp-manifest-long.yaml b/test/e2e/aws-ebs/ocp-manifest-long.yaml
new file mode 100644
index 000000000..8721f758c
--- /dev/null
+++ b/test/e2e/aws-ebs/ocp-manifest-long.yaml
@@ -0,0 +1,6 @@
+Driver: ebs.csi.aws.com
+Capabilities:
+  podDeleteAfterUmount: true
+LUNStressTest:
+  PodsTotal: 260
+  Timeout: "40m" # The test needs ~20 min in ideal conditions.
diff --git a/test/e2e/aws-ebs/ocp-manifest.yaml b/test/e2e/aws-ebs/ocp-manifest.yaml
index 6c670f8a3..bcaf17372 100644
--- a/test/e2e/aws-ebs/ocp-manifest.yaml
+++ b/test/e2e/aws-ebs/ocp-manifest.yaml
@@ -1,4 +1,5 @@
 Driver: ebs.csi.aws.com
+Capabilities:
+  podDeleteAfterUmount: true
 LUNStressTest:
-  PodsTotal: 260
-  Timeout: "40m" # The test needs ~20 min in ideal conditions.
+  PodsTotal: 0
diff --git a/test/e2e/aws-efs/ocp-manifest-long.yaml b/test/e2e/aws-efs/ocp-manifest-long.yaml
new file mode 100644
index 000000000..bf7d6b7b1
--- /dev/null
+++ b/test/e2e/aws-efs/ocp-manifest-long.yaml
@@ -0,0 +1,6 @@
+Driver: efs.csi.aws.com
+Capabilities:
+  podDeleteAfterUmount: true
+LUNStressTest:
+  PodsTotal: 260
+  Timeout: "30m" # The test needs ~10 min in ideal conditions.
diff --git a/test/e2e/aws-efs/ocp-manifest.yaml b/test/e2e/aws-efs/ocp-manifest.yaml
index c4f399bb3..815ee4170 100644
--- a/test/e2e/aws-efs/ocp-manifest.yaml
+++ b/test/e2e/aws-efs/ocp-manifest.yaml
@@ -1,4 +1,5 @@
 Driver: efs.csi.aws.com
+Capabilities:
+  podDeleteAfterUmount: true
 LUNStressTest:
-  PodsTotal: 260
-  Timeout: "30m" # The test needs ~10 min in ideal conditions.
+  PodsTotal: 0
diff --git a/test/e2e/azure-disk/ocp-manifest-long.yaml b/test/e2e/azure-disk/ocp-manifest-long.yaml
new file mode 100644
index 000000000..ded3a8e23
--- /dev/null
+++ b/test/e2e/azure-disk/ocp-manifest-long.yaml
@@ -0,0 +1,6 @@
+Driver: disk.csi.azure.com
+Capabilities:
+  podDeleteAfterUmount: true
+LUNStressTest:
+  PodsTotal: 260
+  Timeout: "60m" # The test needs ~40 min in ideal conditions.
diff --git a/test/e2e/azure-disk/ocp-manifest.yaml b/test/e2e/azure-disk/ocp-manifest.yaml
index b32786821..13a38a756 100644
--- a/test/e2e/azure-disk/ocp-manifest.yaml
+++ b/test/e2e/azure-disk/ocp-manifest.yaml
@@ -1,4 +1,5 @@
 Driver: disk.csi.azure.com
+Capabilities:
+  podDeleteAfterUmount: true
 LUNStressTest:
-  PodsTotal: 260
-  Timeout: "60m" # The test needs ~40 min in ideal conditions.
+  PodsTotal: 0
diff --git a/test/e2e/azure-file/ocp-manifest-long.yaml b/test/e2e/azure-file/ocp-manifest-long.yaml
new file mode 100644
index 000000000..ef81bbe6a
--- /dev/null
+++ b/test/e2e/azure-file/ocp-manifest-long.yaml
@@ -0,0 +1,6 @@
+Driver: file.csi.azure.com
+Capabilities:
+  podDeleteAfterUmount: true
+LUNStressTest:
+  PodsTotal: 10 # See OCPBUGS-60655, Azure throttles provisioning requests
+  Timeout: "30m" # The test needs ~5 min in ideal conditions.
diff --git a/test/e2e/azure-file/ocp-manifest.yaml b/test/e2e/azure-file/ocp-manifest.yaml
index cbe04c717..5c1139fdc 100644
--- a/test/e2e/azure-file/ocp-manifest.yaml
+++ b/test/e2e/azure-file/ocp-manifest.yaml
@@ -1,4 +1,5 @@
 Driver: file.csi.azure.com
+Capabilities:
+  podDeleteAfterUmount: true
 LUNStressTest:
-  PodsTotal: 10 # See OCPBUGS-60655, Azure throttles provisioning requests
-  Timeout: "30m" # The test needs ~5 min in ideal conditions.
+  PodsTotal: 0
diff --git a/test/e2e/gcp-pd/ocp-manifest-long.yaml b/test/e2e/gcp-pd/ocp-manifest-long.yaml
new file mode 100644
index 000000000..9978989cc
--- /dev/null
+++ b/test/e2e/gcp-pd/ocp-manifest-long.yaml
@@ -0,0 +1,6 @@
+Driver: pd.csi.storage.gke.io
+Capabilities:
+  podDeleteAfterUmount: true
+LUNStressTest:
+  PodsTotal: 260
+  Timeout: "30m" # The test needs ~10 min in ideal conditions.
diff --git a/test/e2e/gcp-pd/ocp-manifest.yaml b/test/e2e/gcp-pd/ocp-manifest.yaml
index 99d862002..00b3fc473 100644
--- a/test/e2e/gcp-pd/ocp-manifest.yaml
+++ b/test/e2e/gcp-pd/ocp-manifest.yaml
@@ -1,4 +1,5 @@
 Driver: pd.csi.storage.gke.io
+Capabilities:
+  podDeleteAfterUmount: true
 LUNStressTest:
-  PodsTotal: 260
-  Timeout: "30m" # The test needs ~10 min in ideal conditions.
+  PodsTotal: 0