diff --git a/test/e2e/framework/addon/BUILD.bazel b/test/e2e/framework/addon/BUILD.bazel
index cd82eda9e..0f9d047d8 100644
--- a/test/e2e/framework/addon/BUILD.bazel
+++ b/test/e2e/framework/addon/BUILD.bazel
@@ -28,6 +28,7 @@ filegroup(
         "//test/e2e/framework/addon/base:all-srcs",
         "//test/e2e/framework/addon/chart:all-srcs",
         "//test/e2e/framework/addon/vault:all-srcs",
+        "//test/e2e/framework/addon/venafi:all-srcs",
     ],
     tags = ["automanaged"],
     visibility = ["//visibility:public"],
diff --git a/test/e2e/suite/issuers/venafi/addon/BUILD.bazel b/test/e2e/framework/addon/venafi/BUILD.bazel
similarity index 91%
rename from test/e2e/suite/issuers/venafi/addon/BUILD.bazel
rename to test/e2e/framework/addon/venafi/BUILD.bazel
index eea2e15ac..4bd786f18 100644
--- a/test/e2e/suite/issuers/venafi/addon/BUILD.bazel
+++ b/test/e2e/framework/addon/venafi/BUILD.bazel
@@ -7,7 +7,7 @@ go_library(
         "doc.go",
         "tpp.go",
     ],
-    importpath = "github.com/jetstack/cert-manager/test/e2e/suite/issuers/venafi/addon",
+    importpath = "github.com/jetstack/cert-manager/test/e2e/framework/addon/venafi",
     tags = ["manual"],
     visibility = ["//visibility:public"],
     deps = [
diff --git a/test/e2e/suite/issuers/venafi/addon/cloud.go b/test/e2e/framework/addon/venafi/cloud.go
similarity index 99%
rename from test/e2e/suite/issuers/venafi/addon/cloud.go
rename to test/e2e/framework/addon/venafi/cloud.go
index b91368775..5121c030e 100644
--- a/test/e2e/suite/issuers/venafi/addon/cloud.go
+++ b/test/e2e/framework/addon/venafi/cloud.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package addon
+package venafi
 
 import (
 	"context"
diff --git a/test/e2e/suite/issuers/venafi/addon/doc.go b/test/e2e/framework/addon/venafi/doc.go
similarity index 89%
rename from test/e2e/suite/issuers/venafi/addon/doc.go
rename to test/e2e/framework/addon/venafi/doc.go
index 8732a5e50..b995bf6e1 100644
--- a/test/e2e/suite/issuers/venafi/addon/doc.go
+++ b/test/e2e/framework/addon/venafi/doc.go
@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package addon implements an addon for the Venafi platform.
+// Package venafi implements an addon for the Venafi platform.
 // It provides a means for e2e tests to consume credentials for Venafi TPP.
-package addon
+package venafi
diff --git a/test/e2e/suite/issuers/venafi/addon/tpp.go b/test/e2e/framework/addon/venafi/tpp.go
similarity index 99%
rename from test/e2e/suite/issuers/venafi/addon/tpp.go
rename to test/e2e/framework/addon/venafi/tpp.go
index 2a8aab804..e2309c084 100644
--- a/test/e2e/suite/issuers/venafi/addon/tpp.go
+++ b/test/e2e/framework/addon/venafi/tpp.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package addon
+package venafi
 
 import (
 	"context"
diff --git a/test/e2e/framework/helper/validation/validation.go b/test/e2e/framework/helper/validation/validation.go
index 3a0d2f9d1..c76bd91cb 100644
--- a/test/e2e/framework/helper/validation/validation.go
+++ b/test/e2e/framework/helper/validation/validation.go
@@ -49,7 +49,6 @@ func DefaultCertificateSigningRequestSet() []certificatesigningrequests.Validati
 		certificatesigningrequests.ExpectCertificateURIsToMatch,
 		certificatesigningrequests.ExpectCertificateIPsToMatch,
 		certificatesigningrequests.ExpectValidCommonName,
-		certificatesigningrequests.ExpectValidDuration,
 		certificatesigningrequests.ExpectKeyUsageUsageDigitalSignature,
 		certificatesigningrequests.ExpectEmailsToMatch,
 		certificatesigningrequests.ExpectIsCA,
@@ -92,5 +91,11 @@ func CertificateSetForUnsupportedFeatureSet(fs featureset.FeatureSet) []certific
 }
 
 func CertificateSigningRequestSetForUnsupportedFeatureSet(fs featureset.FeatureSet) []certificatesigningrequests.ValidationFunc {
-	return DefaultCertificateSigningRequestSet()
+	validations := DefaultCertificateSigningRequestSet()
+
+	if !fs.Contains(featureset.DurationFeature) {
+		validations = append(validations, certificatesigningrequests.ExpectValidDuration)
+	}
+
+	return validations
 }
diff --git a/test/e2e/suite/conformance/certificates/venafi/BUILD.bazel b/test/e2e/suite/conformance/certificates/venafi/BUILD.bazel
index 709ecd240..7b7961877 100644
--- a/test/e2e/suite/conformance/certificates/venafi/BUILD.bazel
+++ b/test/e2e/suite/conformance/certificates/venafi/BUILD.bazel
@@ -9,10 +9,10 @@ go_library(
         "//pkg/apis/certmanager/v1:go_default_library",
         "//pkg/apis/meta/v1:go_default_library",
         "//test/e2e/framework:go_default_library",
+        "//test/e2e/framework/addon/venafi:go_default_library",
         "//test/e2e/framework/helper/featureset:go_default_library",
         "//test/e2e/framework/util/errors:go_default_library",
         "//test/e2e/suite/conformance/certificates:go_default_library",
-        "//test/e2e/suite/issuers/venafi/addon:go_default_library",
         "@com_github_onsi_ginkgo//:go_default_library",
         "@com_github_onsi_gomega//:go_default_library",
         "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
diff --git a/test/e2e/suite/conformance/certificates/venafi/venafi.go b/test/e2e/suite/conformance/certificates/venafi/venafi.go
index f2142ffd6..5a909c4ba 100644
--- a/test/e2e/suite/conformance/certificates/venafi/venafi.go
+++ b/test/e2e/suite/conformance/certificates/venafi/venafi.go
@@ -26,10 +26,10 @@ 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/test/e2e/framework"
+	vaddon "github.com/jetstack/cert-manager/test/e2e/framework/addon/venafi"
 	"github.com/jetstack/cert-manager/test/e2e/framework/helper/featureset"
 	"github.com/jetstack/cert-manager/test/e2e/framework/util/errors"
 	"github.com/jetstack/cert-manager/test/e2e/suite/conformance/certificates"
-	vaddon "github.com/jetstack/cert-manager/test/e2e/suite/issuers/venafi/addon"
 )
 
 var _ = framework.ConformanceDescribe("Certificates", func() {
diff --git a/test/e2e/suite/conformance/certificates/venaficloud/BUILD.bazel b/test/e2e/suite/conformance/certificates/venaficloud/BUILD.bazel
index 4046d2505..e22142c9b 100644
--- a/test/e2e/suite/conformance/certificates/venaficloud/BUILD.bazel
+++ b/test/e2e/suite/conformance/certificates/venaficloud/BUILD.bazel
@@ -9,10 +9,10 @@ go_library(
         "//pkg/apis/certmanager/v1:go_default_library",
         "//pkg/apis/meta/v1:go_default_library",
         "//test/e2e/framework:go_default_library",
+        "//test/e2e/framework/addon/venafi:go_default_library",
         "//test/e2e/framework/helper/featureset:go_default_library",
         "//test/e2e/framework/util/errors:go_default_library",
         "//test/e2e/suite/conformance/certificates:go_default_library",
-        "//test/e2e/suite/issuers/venafi/addon:go_default_library",
         "@com_github_onsi_ginkgo//:go_default_library",
         "@com_github_onsi_gomega//:go_default_library",
         "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
diff --git a/test/e2e/suite/conformance/certificates/venaficloud/cloud.go b/test/e2e/suite/conformance/certificates/venaficloud/cloud.go
index 08dd887cc..3b1fde1b6 100644
--- a/test/e2e/suite/conformance/certificates/venaficloud/cloud.go
+++ b/test/e2e/suite/conformance/certificates/venaficloud/cloud.go
@@ -26,10 +26,10 @@ 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/test/e2e/framework"
+	vaddon "github.com/jetstack/cert-manager/test/e2e/framework/addon/venafi"
 	"github.com/jetstack/cert-manager/test/e2e/framework/helper/featureset"
 	"github.com/jetstack/cert-manager/test/e2e/framework/util/errors"
 	"github.com/jetstack/cert-manager/test/e2e/suite/conformance/certificates"
-	vaddon "github.com/jetstack/cert-manager/test/e2e/suite/issuers/venafi/addon"
 )
 
 var _ = framework.ConformanceDescribe("[Feature:Issuers:Venafi:Cloud] Certificates", func() {
diff --git a/test/e2e/suite/issuers/venafi/BUILD.bazel b/test/e2e/suite/issuers/venafi/BUILD.bazel
index 55dbd9eee..d6136ba37 100644
--- a/test/e2e/suite/issuers/venafi/BUILD.bazel
+++ b/test/e2e/suite/issuers/venafi/BUILD.bazel
@@ -19,7 +19,6 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//test/e2e/suite/issuers/venafi/addon:all-srcs",
         "//test/e2e/suite/issuers/venafi/tpp:all-srcs",
     ],
     tags = ["automanaged"],
diff --git a/test/e2e/suite/issuers/venafi/tpp/BUILD.bazel b/test/e2e/suite/issuers/venafi/tpp/BUILD.bazel
index 3900c5983..030b7e18e 100644
--- a/test/e2e/suite/issuers/venafi/tpp/BUILD.bazel
+++ b/test/e2e/suite/issuers/venafi/tpp/BUILD.bazel
@@ -15,7 +15,7 @@ go_library(
         "//pkg/apis/meta/v1:go_default_library",
         "//pkg/util:go_default_library",
         "//test/e2e/framework:go_default_library",
-        "//test/e2e/suite/issuers/venafi/addon:go_default_library",
+        "//test/e2e/framework/addon/venafi:go_default_library",
         "//test/e2e/util:go_default_library",
         "@com_github_onsi_ginkgo//:go_default_library",
         "@com_github_onsi_gomega//:go_default_library",
diff --git a/test/e2e/suite/issuers/venafi/tpp/certificate.go b/test/e2e/suite/issuers/venafi/tpp/certificate.go
index 55d818fa6..a58f8b1d1 100644
--- a/test/e2e/suite/issuers/venafi/tpp/certificate.go
+++ b/test/e2e/suite/issuers/venafi/tpp/certificate.go
@@ -28,7 +28,7 @@ import (
 	cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
 	cmutil "github.com/jetstack/cert-manager/pkg/util"
 	"github.com/jetstack/cert-manager/test/e2e/framework"
-	vaddon "github.com/jetstack/cert-manager/test/e2e/suite/issuers/venafi/addon"
+	vaddon "github.com/jetstack/cert-manager/test/e2e/framework/addon/venafi"
 	"github.com/jetstack/cert-manager/test/e2e/util"
 )
 
diff --git a/test/e2e/suite/issuers/venafi/tpp/certificaterequest.go b/test/e2e/suite/issuers/venafi/tpp/certificaterequest.go
index 31c074b0e..bec3a00be 100644
--- a/test/e2e/suite/issuers/venafi/tpp/certificaterequest.go
+++ b/test/e2e/suite/issuers/venafi/tpp/certificaterequest.go
@@ -29,7 +29,7 @@ import (
 	cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
 	cmutil "github.com/jetstack/cert-manager/pkg/util"
 	"github.com/jetstack/cert-manager/test/e2e/framework"
-	vaddon "github.com/jetstack/cert-manager/test/e2e/suite/issuers/venafi/addon"
+	vaddon "github.com/jetstack/cert-manager/test/e2e/framework/addon/venafi"
 	"github.com/jetstack/cert-manager/test/e2e/util"
 )