diff --git a/test/e2e/storage/persistent_volumes.go b/test/e2e/storage/persistent_volumes.go
index 99258054e67..8571da30b49 100644
--- a/test/e2e/storage/persistent_volumes.go
+++ b/test/e2e/storage/persistent_volumes.go
@@ -452,8 +452,9 @@ var _ = utils.SIGDescribe("PersistentVolumes", func() {
 
 			pvNamePrefix := ns + "-"
 			pvHostPathConfig := e2epv.PersistentVolumeConfig{
-				NamePrefix: pvNamePrefix,
-				Labels:     volLabel,
+				NamePrefix:       pvNamePrefix,
+				Labels:           volLabel,
+				StorageClassName: ns,
 				PVSource: v1.PersistentVolumeSource{
 					CSI: &v1.CSIPersistentVolumeSource{
 						Driver:       csiDriver.Name,
@@ -461,6 +462,9 @@ var _ = utils.SIGDescribe("PersistentVolumes", func() {
 					},
 				},
 			}
+			pvcConfig := e2epv.PersistentVolumeClaimConfig{
+				StorageClassName: &ns,
+			}
 
 			numPVs, numPVCs := 1, 1
 			pvols, claims, err = e2epv.CreatePVsPVCs(ctx, numPVs, numPVCs, c, f.Timeouts, ns, pvHostPathConfig, pvcConfig)
@@ -680,6 +684,10 @@ var _ = utils.SIGDescribe("PersistentVolumes", func() {
 				},
 			}
 
+			pvcConfig := e2epv.PersistentVolumeClaimConfig{
+				StorageClassName: &ns,
+			}
+
 			numPVs, numPVCs := 1, 1
 			pvols, claims, err = e2epv.CreatePVsPVCs(ctx, numPVs, numPVCs, c, f.Timeouts, ns, pvHostPathConfig, pvcConfig)
 			framework.ExpectNoError(err, "Failed to create the requested storage resources")