diff --git a/devel/run-e2e.sh b/devel/run-e2e.sh
index 9c1a7b531..f96398be3 100755
--- a/devel/run-e2e.sh
+++ b/devel/run-e2e.sh
@@ -49,7 +49,7 @@ if [[ -n "$GINKGO_FOCUS" ]]; then GINKGO_FOCUS="--ginkgo.focus=${GINKGO_FOCUS}";
 if  [[ -n "$GINKGO_SKIP" ]]; then GINKGO_SKIP="--ginkgo.skip=${GINKGO_SKIP}"; fi
 
 # Default feature gates to enable
-FEATURE_GATES="${FEATURE_GATES:-ExperimentalCertificateSigningRequestControllers=true,ExperimentalGatewayAPISupport=true}"
+FEATURE_GATES="${FEATURE_GATES:-ExperimentalCertificateSigningRequestControllers=true,ExperimentalGatewayAPISupport=true,ExperimentalSecretApplySecretTemplateControllerMinKubernetesVTODO=true}"
 
 # Configure PATH to use bazel provided e2e tools
 setup_tools
diff --git a/test/e2e/suite/secrettemplate/BUILD.bazel b/test/e2e/suite/secrettemplate/BUILD.bazel
index 14a8af79f..b0b2d5736 100644
--- a/test/e2e/suite/secrettemplate/BUILD.bazel
+++ b/test/e2e/suite/secrettemplate/BUILD.bazel
@@ -9,7 +9,7 @@ go_library(
         "//pkg/apis/certmanager/v1:go_default_library",
         "//pkg/apis/meta/v1:go_default_library",
         "//pkg/feature:go_default_library",
-        "//pkg/util:go_default_library",
+        "//pkg/util/feature:go_default_library",
         "//test/e2e/framework:go_default_library",
         "//test/e2e/util:go_default_library",
         "//test/unit/gen:go_default_library",
diff --git a/test/e2e/suite/secrettemplate/secrettemplate.go b/test/e2e/suite/secrettemplate/secrettemplate.go
index d4da760f5..a9b3fadc6 100644
--- a/test/e2e/suite/secrettemplate/secrettemplate.go
+++ b/test/e2e/suite/secrettemplate/secrettemplate.go
@@ -19,7 +19,6 @@ package secrettemplate
 import (
 	"bytes"
 	"context"
-	"os"
 	"strings"
 	"time"
 
@@ -33,7 +32,7 @@ import (
 	cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
 	cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
 	"github.com/jetstack/cert-manager/pkg/feature"
-	"github.com/jetstack/cert-manager/pkg/util"
+	utilfeature "github.com/jetstack/cert-manager/pkg/util/feature"
 	"github.com/jetstack/cert-manager/test/e2e/framework"
 	e2eutil "github.com/jetstack/cert-manager/test/e2e/util"
 	"github.com/jetstack/cert-manager/test/unit/gen"
@@ -53,8 +52,7 @@ var _ = framework.CertManagerDescribe("Certificate SecretTemplate", func() {
 	// Only run tests if the SecretTemplate feature is enabled. Skip otherwise.
 	it := func(name string, testfn func()) {
 		It(name, func() {
-			fgs := os.Getenv("FEATURE_GATES")
-			if !util.Contains(strings.Split(fgs, ","), string(feature.ExperimentalSecretApplySecretTemplateControllerMinKubernetesVTODO)+"=true") {
+			if !utilfeature.DefaultFeatureGate.Enabled(feature.ExperimentalSecretApplySecretTemplateControllerMinKubernetesVTODO) {
 				framework.Skipf("skipping Certificates SecretTemplate controller test since FEATURE_GATE %s is not enabled",
 					feature.ExperimentalSecretApplySecretTemplateControllerMinKubernetesVTODO)
 				return