diff --git a/test/e2e/storage/drivers/openshift_group_snapshot_driver.go b/test/e2e/storage/drivers/openshift_group_snapshot_driver.go
index fcf1b82d6b78c..dbb3b1773c4c0 100644
--- a/test/e2e/storage/drivers/openshift_group_snapshot_driver.go
+++ b/test/e2e/storage/drivers/openshift_group_snapshot_driver.go
@@ -84,19 +84,19 @@ var _ storageframework.SnapshottableTestDriver = &groupSnapshotHostpathCSIDriver
 var _ storageframework.EphemeralTestDriver = &groupSnapshotHostpathCSIDriver{}
 
 // InitgroupSnapshotHostpathCSIDriver returns groupSnapshotHostpathCSIDriver that implements TestDriver interface
-func InitGroupSnapshotHostpathCSIDriver() storageframework.TestDriver {
+func InitGroupSnapshotHostpathCSIDriver(name string) storageframework.TestDriver {
 	capabilities := map[storageframework.Capability]bool{
 		storageframework.CapPersistence:                    true,
 		storageframework.CapSnapshotDataSource:             true,
-		storageframework.CapMultiPODs:                      true,
-		storageframework.CapBlock:                          true,
-		storageframework.CapPVCDataSource:                  true,
-		storageframework.CapControllerExpansion:            true,
-		storageframework.CapOfflineExpansion:               true,
-		storageframework.CapOnlineExpansion:                true,
-		storageframework.CapSingleNodeVolume:               true,
+		storageframework.CapMultiPODs:                      false,
+		storageframework.CapBlock:                          false,
+		storageframework.CapPVCDataSource:                  false,
+		storageframework.CapControllerExpansion:            false,
+		storageframework.CapOfflineExpansion:               false,
+		storageframework.CapOnlineExpansion:                false,
+		storageframework.CapSingleNodeVolume:               false,
 		storageframework.CapReadWriteOncePod:               true,
-		storageframework.CapMultiplePVsSameID:              true,
+		storageframework.CapMultiplePVsSameID:              false,
 		storageframework.CapFSResizeFromSourceNotSupported: true,
 		storageframework.CapVolumeGroupSnapshot:            true,
 
@@ -104,10 +104,10 @@ func InitGroupSnapshotHostpathCSIDriver() storageframework.TestDriver {
 		// testsuites/volumelimits.go `should support volume limits`
 		// test. --maxvolumespernode=10 gets
 		// added when patching the deployment.
-		storageframework.CapVolumeLimits: true,
+		storageframework.CapVolumeLimits: false,
 	}
 	// OCP specific code: a different driver name (csi-hostpath-groupsnapshot)
-	return initGroupSnapshotHostpathCSIDriver("csi-hostpath-groupsnapshot",
+	return initGroupSnapshotHostpathCSIDriver(name,
 		capabilities,
 		// Volume attributes don't matter, but we have to provide at least one map.
 		[]map[string]string{
diff --git a/test/e2e/storage/openshift_csi_volumes.go b/test/e2e/storage/openshift_csi_volumes.go
index 4ebc74be6e9ac..0469d9648b77e 100644
--- a/test/e2e/storage/openshift_csi_volumes.go
+++ b/test/e2e/storage/openshift_csi_volumes.go
@@ -19,6 +19,8 @@ limitations under the License.
 package storage
 
 import (
+	"fmt"
+
 	"k8s.io/kubernetes/test/e2e/framework"
 	"k8s.io/kubernetes/test/e2e/storage/drivers"
 	storageframework "k8s.io/kubernetes/test/e2e/storage/framework"
@@ -27,19 +29,22 @@ import (
 )
 
 // List of testDrivers to be executed in below loop
-var ocpCSITestDrivers = []func() storageframework.TestDriver{
+var ocpCSITestDrivers = []func(string) storageframework.TestDriver{
 	drivers.InitGroupSnapshotHostpathCSIDriver,
 }
 
 // This executes testSuites for csi volumes.
 var _ = utils.SIGDescribe("OCP CSI Volumes", func() {
 	for _, initDriver := range ocpCSITestDrivers {
-		curDriver := initDriver()
+		for i := range 30 {
+			name := fmt.Sprintf("csi-hostpath-groupsnapshot-%d", i)
+			curDriver := initDriver(name)
+			args := storageframework.GetDriverNameWithFeatureTags(curDriver)
+			args = append(args, func() {
+				storageframework.DefineTestSuites(curDriver, testsuites.CSISuites)
+			})
+			framework.Context(args...)
+		}
 
-		args := storageframework.GetDriverNameWithFeatureTags(curDriver)
-		args = append(args, func() {
-			storageframework.DefineTestSuites(curDriver, testsuites.CSISuites)
-		})
-		framework.Context(args...)
 	}
 })