diff --git a/pkg/scheduler/framework/plugins/nodevolumelimits/csi_manager.go b/pkg/scheduler/framework/plugins/nodevolumelimits/csi_manager.go
index 4cbaa53e204..80b80f5f6f2 100644
--- a/pkg/scheduler/framework/plugins/nodevolumelimits/csi_manager.go
+++ b/pkg/scheduler/framework/plugins/nodevolumelimits/csi_manager.go
@@ -23,15 +23,15 @@ import (
 	fwk "k8s.io/kube-scheduler/framework"
 )
 
-// CSIManagerImpl is a implementation of the CSIManager interface.
+// DefaultCSIManager is an implementation of the CSIManager interface.
 type DefaultCSIManager struct {
 	defaultCSINodeLister *csiNodeLister
 }
 
 var _ fwk.CSIManager = &DefaultCSIManager{}
 
-func NewCSIManager(csinodeLister storagelisters.CSINodeLister) *DefaultCSIManager {
-	return &DefaultCSIManager{defaultCSINodeLister: NewCsiNodeLister(csinodeLister)}
+func NewCSIManager(csiNodeLister storagelisters.CSINodeLister) *DefaultCSIManager {
+	return &DefaultCSIManager{defaultCSINodeLister: NewCSINodeLister(csiNodeLister)}
 }
 
 func (m *DefaultCSIManager) CSINodes() fwk.CSINodeLister {
@@ -44,7 +44,7 @@ type csiNodeLister struct {
 
 var _ fwk.CSINodeLister = &csiNodeLister{}
 
-func NewCsiNodeLister(csinodeLister storagelisters.CSINodeLister) *csiNodeLister {
+func NewCSINodeLister(csinodeLister storagelisters.CSINodeLister) *csiNodeLister {
 	return &csiNodeLister{csinodeLister: csinodeLister}
 }
 
diff --git a/pkg/scheduler/framework/runtime/framework.go b/pkg/scheduler/framework/runtime/framework.go
index f2bcf89e62b..0f1c3225ba7 100644
--- a/pkg/scheduler/framework/runtime/framework.go
+++ b/pkg/scheduler/framework/runtime/framework.go
@@ -80,7 +80,6 @@ type frameworkImpl struct {
 	sharedDRAManager fwk.SharedDRAManager
 	logger           klog.Logger
 
-	// for tracking CSI node limits
 	sharedCSIManager fwk.CSIManager
 
 	metricsRecorder          *metrics.MetricAsyncRecorder
diff --git a/test/e2e/storage/csimock/csi_volume_limit_scaling.go b/test/e2e/storage/csimock/csi_volume_limit_scaling.go
index 0aeb496fe3d..0ce6a0d42bb 100644
--- a/test/e2e/storage/csimock/csi_volume_limit_scaling.go
+++ b/test/e2e/storage/csimock/csi_volume_limit_scaling.go
@@ -30,7 +30,6 @@ import (
 	"k8s.io/utils/ptr"
 
 	"k8s.io/kubernetes/pkg/features"
-	"k8s.io/kubernetes/test/e2e/feature"
 	"k8s.io/kubernetes/test/e2e/framework"
 	e2eevents "k8s.io/kubernetes/test/e2e/framework/events"
 	e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
@@ -39,26 +38,23 @@ import (
 	"k8s.io/kubernetes/test/e2e/storage/utils"
 )
 
-var _ = utils.SIGDescribe("CSI Mock VolumeLimitScaling scheduling", func() {
+var _ = utils.SIGDescribe("CSI Mock VolumeLimitScaling scheduling", framework.WithFeatureGate(features.VolumeLimitScaling), func() {
 	f := framework.NewDefaultFramework("csi-mock-volumes-limit-sched")
 	f.NamespacePodSecurityLevel = admissionapi.LevelPrivileged
 
-	f.Context("VolumeLimitScaling scheduling", feature.Volumes, func() {
+	f.Context("VolumeLimitScaling scheduling", func() {
 		tests := []struct {
 			name              string
-			featureTags       []interface{}
 			csiDriverPresent  bool
 			expectSchedulable bool
 		}{
 			{
 				name:              "blocks scheduling when driver not installed and CSIDriver is present",
-				featureTags:       []interface{}{framework.WithFeatureGate(features.VolumeLimitScaling)},
 				csiDriverPresent:  true,
 				expectSchedulable: false,
 			},
 			{
 				name:              "allows scheduling when driver not installed and CSIDriver object is not present",
-				featureTags:       []interface{}{framework.WithFeatureGate(features.VolumeLimitScaling)},
 				csiDriverPresent:  false,
 				expectSchedulable: true,
 			},
@@ -143,7 +139,6 @@ var _ = utils.SIGDescribe("CSI Mock VolumeLimitScaling scheduling", func() {
 
 			// Compose It with feature tags
 			args := []interface{}{tc.name, testFunc}
-			args = append(args, tc.featureTags...)
 			framework.It(args...)
 		}
 	})