diff --git a/test/e2e/storage/testsuites/volumelimits.go b/test/e2e/storage/testsuites/volumelimits.go
index d730c4171eb..153437705cb 100644
--- a/test/e2e/storage/testsuites/volumelimits.go
+++ b/test/e2e/storage/testsuites/volumelimits.go
@@ -130,6 +130,54 @@ func (t *volumeLimitsTestSuite) DefineTests(driver storageframework.TestDriver,
 		dDriver = driver.(storageframework.DynamicPVTestDriver)
 	})
 
+	cleanupTest := func(ctx context.Context, timeout time.Duration) error {
+		var cleanupErrors []string
+		for _, podName := range l.podNames {
+			framework.Logf("Deleting pod %s", podName)
+			err := l.cs.CoreV1().Pods(l.ns.Name).Delete(ctx, podName, metav1.DeleteOptions{})
+			if err != nil && !apierrors.IsNotFound(err) {
+				cleanupErrors = append(cleanupErrors, fmt.Sprintf("failed to delete pod %s: %s", podName, err))
+			}
+		}
+		for _, pvcName := range l.pvcNames {
+			framework.Logf("Deleting PVC %s", pvcName)
+			err := l.cs.CoreV1().PersistentVolumeClaims(l.ns.Name).Delete(ctx, pvcName, metav1.DeleteOptions{})
+			if err != nil && !apierrors.IsNotFound(err) {
+				cleanupErrors = append(cleanupErrors, fmt.Sprintf("failed to delete PVC %s: %s", pvcName, err))
+			}
+		}
+		// Wait for the PVs to be deleted. It includes also pod and PVC deletion because of PVC protection.
+		// We use PVs to make sure that the test does not leave orphan PVs when a CSI driver is destroyed
+		// just after the test ends.
+		err := wait.PollUntilContextTimeout(ctx, 5*time.Second, timeout, false, func(ctx context.Context) (bool, error) {
+			existing := 0
+			for _, pvName := range l.pvNames.UnsortedList() {
+				_, err := l.cs.CoreV1().PersistentVolumes().Get(ctx, pvName, metav1.GetOptions{})
+				if err == nil {
+					existing++
+				} else {
+					if apierrors.IsNotFound(err) {
+						l.pvNames.Delete(pvName)
+					} else {
+						framework.Logf("Failed to get PV %s: %s", pvName, err)
+					}
+				}
+			}
+			if existing > 0 {
+				framework.Logf("Waiting for %d PVs to be deleted", existing)
+				return false, nil
+			}
+			return true, nil
+		})
+		if err != nil {
+			cleanupErrors = append(cleanupErrors, fmt.Sprintf("timed out waiting for PVs to be deleted: %s", err))
+		}
+		if len(cleanupErrors) != 0 {
+			return errors.New("test cleanup failed: " + strings.Join(cleanupErrors, "; "))
+		}
+		return nil
+	}
+
 	// This checks that CSIMaxVolumeLimitChecker works as expected.
 	// A randomly chosen node should be able to handle as many CSI volumes as
 	// it claims to handle in CSINode.Spec.Drivers[x].Allocatable.
@@ -169,7 +217,7 @@ func (t *volumeLimitsTestSuite) DefineTests(driver storageframework.TestDriver,
 
 		l.resource = storageframework.CreateVolumeResource(ctx, driver, l.config, pattern, testVolumeSizeRange)
 		ginkgo.DeferCleanup(l.resource.CleanupResource)
-		ginkgo.DeferCleanup(cleanupTest, l.cs, l.ns.Name, l.podNames, l.pvcNames, l.pvNames, testSlowMultiplier*f.Timeouts.PVDelete)
+		ginkgo.DeferCleanup(cleanupTest, testSlowMultiplier*f.Timeouts.PVDelete)
 
 		selection := e2epod.NodeSelection{Name: nodeName}
 
@@ -279,52 +327,6 @@ func (t *volumeLimitsTestSuite) DefineTests(driver storageframework.TestDriver,
 	})
 }
 
-func cleanupTest(ctx context.Context, cs clientset.Interface, ns string, podNames, pvcNames []string, pvNames sets.Set[string], timeout time.Duration) error {
-	var cleanupErrors []string
-	for _, podName := range podNames {
-		err := cs.CoreV1().Pods(ns).Delete(ctx, podName, metav1.DeleteOptions{})
-		if err != nil {
-			cleanupErrors = append(cleanupErrors, fmt.Sprintf("failed to delete pod %s: %s", podName, err))
-		}
-	}
-	for _, pvcName := range pvcNames {
-		err := cs.CoreV1().PersistentVolumeClaims(ns).Delete(ctx, pvcName, metav1.DeleteOptions{})
-		if !apierrors.IsNotFound(err) {
-			cleanupErrors = append(cleanupErrors, fmt.Sprintf("failed to delete PVC %s: %s", pvcName, err))
-		}
-	}
-	// Wait for the PVs to be deleted. It includes also pod and PVC deletion because of PVC protection.
-	// We use PVs to make sure that the test does not leave orphan PVs when a CSI driver is destroyed
-	// just after the test ends.
-	err := wait.PollUntilContextTimeout(ctx, 5*time.Second, timeout, false, func(ctx context.Context) (bool, error) {
-		existing := 0
-		for _, pvName := range pvNames.UnsortedList() {
-			_, err := cs.CoreV1().PersistentVolumes().Get(ctx, pvName, metav1.GetOptions{})
-			if err == nil {
-				existing++
-			} else {
-				if apierrors.IsNotFound(err) {
-					pvNames.Delete(pvName)
-				} else {
-					framework.Logf("Failed to get PV %s: %s", pvName, err)
-				}
-			}
-		}
-		if existing > 0 {
-			framework.Logf("Waiting for %d PVs to be deleted", existing)
-			return false, nil
-		}
-		return true, nil
-	})
-	if err != nil {
-		cleanupErrors = append(cleanupErrors, fmt.Sprintf("timed out waiting for PVs to be deleted: %s", err))
-	}
-	if len(cleanupErrors) != 0 {
-		return errors.New("test cleanup failed: " + strings.Join(cleanupErrors, "; "))
-	}
-	return nil
-}
-
 // waitForAllPVCsBound waits until the given PVCs are all bound. It then returns the bound PVC names as a set.
 func waitForAllPVCsBound(ctx context.Context, cs clientset.Interface, timeout time.Duration, ns string, pvcNames []string) sets.Set[string] {
 	pvNames := sets.New[string]()