diff --git a/test/e2e/storage/drivers/csi.go b/test/e2e/storage/drivers/csi.go
index d82e50025d9..68c3705d607 100644
--- a/test/e2e/storage/drivers/csi.go
+++ b/test/e2e/storage/drivers/csi.go
@@ -757,7 +757,7 @@ func (g *gcePDCSIDriver) SkipUnsupportedTest(pattern storageframework.TestPatter
 	if pattern.FsType == "xfs" {
 		e2eskipper.SkipUnlessNodeOSDistroIs("ubuntu", "custom")
 	}
-	if pattern.FeatureTag == "[sig-windows]" {
+	if pattern.FeatureTag == "[Feature:Windows]" {
 		e2eskipper.Skipf("Skipping tests for windows since CSI does not support it yet")
 	}
 }
diff --git a/test/e2e/storage/drivers/in_tree.go b/test/e2e/storage/drivers/in_tree.go
index e4c8559c89f..787f2a39614 100644
--- a/test/e2e/storage/drivers/in_tree.go
+++ b/test/e2e/storage/drivers/in_tree.go
@@ -1299,7 +1299,7 @@ func (g *gcePdDriver) GetDriverInfo() *storageframework.DriverInfo {
 
 func (g *gcePdDriver) SkipUnsupportedTest(pattern storageframework.TestPattern) {
 	e2eskipper.SkipUnlessProviderIs("gce", "gke")
-	if pattern.FeatureTag == "[sig-windows]" {
+	if pattern.FeatureTag == "[Feature:Windows]" {
 		e2eskipper.SkipUnlessNodeOSDistroIs("windows")
 	}
 }
diff --git a/test/e2e/storage/framework/testpattern.go b/test/e2e/storage/framework/testpattern.go
index 8ee2e3c2207..232022de345 100644
--- a/test/e2e/storage/framework/testpattern.go
+++ b/test/e2e/storage/framework/testpattern.go
@@ -229,35 +229,35 @@ var (
 		Name:       "Inline-volume (ntfs)",
 		VolType:    InlineVolume,
 		FsType:     "ntfs",
-		FeatureTag: "[sig-windows]",
+		FeatureTag: "[Feature:Windows]",
 	}
 	// NtfsCSIEphemeralVolume is TestPattern for "CSI Ephemeral-volume (ntfs)"
 	NtfsCSIEphemeralVolume = TestPattern{
 		Name:       "CSI Ephemeral-volume (ntfs) [alpha]",
 		VolType:    CSIInlineVolume,
 		FsType:     "ntfs",
-		FeatureTag: "[sig-windows]",
+		FeatureTag: "[Feature:Windows]",
 	}
 	// NtfsGenericEphemeralVolume is TestPattern for "Generic Ephemeral-volume (ntfs)"
 	NtfsGenericEphemeralVolume = TestPattern{
 		Name:       "Generic Ephemeral-volume (ntfs) [Feature:GenericEphemeralVolume]",
 		VolType:    GenericEphemeralVolume,
 		FsType:     "ntfs",
-		FeatureTag: "[sig-windows]",
+		FeatureTag: "[Feature:Windows]",
 	}
 	// NtfsPreprovisionedPV is TestPattern for "Pre-provisioned PV (ntfs)"
 	NtfsPreprovisionedPV = TestPattern{
 		Name:       "Pre-provisioned PV (ntfs)",
 		VolType:    PreprovisionedPV,
 		FsType:     "ntfs",
-		FeatureTag: "[sig-windows]",
+		FeatureTag: "[Feature:Windows]",
 	}
 	// NtfsDynamicPV is TestPattern for "Dynamic PV (ntfs)"
 	NtfsDynamicPV = TestPattern{
 		Name:                   "Dynamic PV (ntfs)",
 		VolType:                DynamicPV,
 		FsType:                 "ntfs",
-		FeatureTag:             "[sig-windows]",
+		FeatureTag:             "[Feature:Windows]",
 		SnapshotDeletionPolicy: DeleteSnapshot,
 		SnapshotType:           DynamicCreatedSnapshot,
 	}
@@ -340,7 +340,7 @@ var (
 		VolType:        DynamicPV,
 		AllowExpansion: true,
 		FsType:         "ntfs",
-		FeatureTag:     "[sig-windows]",
+		FeatureTag:     "[Feature:Windows]",
 	}
 
 	// BlockVolModeDynamicPVAllowExpansion is TestPattern for "Dynamic PV (block volmode)(allowExpansion)"
diff --git a/test/e2e/windows/README.md b/test/e2e/windows/README.md
index 94f715aa4a9..699a3aedc01 100644
--- a/test/e2e/windows/README.md
+++ b/test/e2e/windows/README.md
@@ -11,7 +11,7 @@ export KUBE_TEST_REPO_LIST=$(pwd)/repo_list
 1. Run only sig-windows tests:
 
     ```bash
-    ./e2e.test --provider=local --ginkgo.noColor --ginkgo.focus="\[sig-windows\]" --node-os-distro="windows"
+    ./e2e.test --provider=local --ginkgo.noColor --ginkgo.focus="\[sig-windows\]|\[Feature:Windows\]" --node-os-distro="windows"
     ```