diff --git a/test/extended/authentication/oidc.go b/test/extended/authentication/oidc.go
index 4ad1f1cd8425..9610c0926ac6 100644
--- a/test/extended/authentication/oidc.go
+++ b/test/extended/authentication/oidc.go
@@ -113,15 +113,12 @@ var _ = g.Describe("[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow]
 				o.Expect(apiServerArgs["authentication-config"].([]interface{})[0].(string)).To(o.Equal("/etc/kubernetes/static-pod-resources/configmaps/auth-config/auth-config.json"))
 			})
 
-			g.It("[Skipped] should remove the OpenShift OAuth stack", func() {
-				g.Skip("functionality not yet implemented")
-				/*
-					o.Eventually(func(gomega o.Gomega) {
-						_, err := oc.AdminKubeClient().AppsV1().Deployments("openshift-authentication").Get(ctx, "oauth-openshift", metav1.GetOptions{})
-						gomega.Expect(err).NotTo(o.BeNil(), "should not be able to get the integrated oauth stack")
-						gomega.Expect(apierrors.IsNotFound(err)).To(o.BeTrue(), "integrated oauth stack should not be present when OIDC authentication is configured")
-					}).WithTimeout(20 * time.Minute).WithPolling(30 * time.Second).Should(o.Succeed())
-				*/
+			g.It("should remove the OpenShift OAuth stack", func() {
+				o.Eventually(func(gomega o.Gomega) {
+					_, err := oc.AdminKubeClient().AppsV1().Deployments("openshift-authentication").Get(ctx, "oauth-openshift", metav1.GetOptions{})
+					gomega.Expect(err).NotTo(o.BeNil(), "should not be able to get the integrated oauth stack")
+					gomega.Expect(apierrors.IsNotFound(err)).To(o.BeTrue(), "integrated oauth stack should not be present when OIDC authentication is configured")
+				}).WithTimeout(5 * time.Minute).WithPolling(10 * time.Second).Should(o.Succeed())
 			})
 
 			g.It("should not accept tokens provided by the OAuth server", func() {
@@ -332,32 +329,26 @@ var _ = g.Describe("[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow]
 				})
 			})
 
-			g.Describe("[Skipped] with invalid specified UID or Extra claim mappings", func() {
+			g.Describe("with invalid specified UID or Extra claim mappings", func() {
 				g.It("should reject admission when UID claim expression is not compilable CEL", func() {
-					g.Skip("functionality not yet implemented")
-					/*
-						_, _, err := configureOIDCAuthentication(ctx, oc, func(o *configv1.OIDCProvider) {
-							o.ClaimMappings.UID = &configv1.TokenClaimOrExpressionMapping{
-								Expression: "!@&*#^",
-							}
-						})
-						o.Expect(err).To(o.HaveOccurred(), "should encounter an error configuring OIDC authentication")
-					*/
+					_, _, err := configureOIDCAuthentication(ctx, oc, keycloakNamespace, func(o *configv1.OIDCProvider) {
+						o.ClaimMappings.UID = &configv1.TokenClaimOrExpressionMapping{
+							Expression: "!@&*#^",
+						}
+					})
+					o.Expect(err).To(o.HaveOccurred(), "should encounter an error configuring OIDC authentication")
 				})
 
 				g.It("should reject admission when Extra claim expression is not compilable CEL", func() {
-					g.Skip("functionality not yet implemented")
-					/*
-						_, _, err := configureOIDCAuthentication(ctx, oc, func(o *configv1.OIDCProvider) {
-							o.ClaimMappings.Extra = []configv1.ExtraMapping{
-								{
-									Key:             "payload/test",
-									ValueExpression: "!@*&#^!@(*&^",
-								},
-							}
-						})
-						o.Expect(err).To(o.HaveOccurred(), "should encounter an error configuring OIDC authentication")
-					*/
+					_, _, err := configureOIDCAuthentication(ctx, oc, keycloakNamespace, func(o *configv1.OIDCProvider) {
+						o.ClaimMappings.Extra = []configv1.ExtraMapping{
+							{
+								Key:             "payload/test",
+								ValueExpression: "!@*&#^!@(*&^",
+							},
+						}
+					})
+					o.Expect(err).To(o.HaveOccurred(), "should encounter an error configuring OIDC authentication")
 				})
 			})
 		})
diff --git a/test/extended/util/annotate/generated/zz_generated.annotations.go b/test/extended/util/annotate/generated/zz_generated.annotations.go
index 570515f285df..97d1cc08d3b0 100644
--- a/test/extended/util/annotate/generated/zz_generated.annotations.go
+++ b/test/extended/util/annotate/generated/zz_generated.annotations.go
@@ -465,9 +465,9 @@ var Annotations = map[string]string{
 
 	"[sig-auth][Feature:UserAPI] users can manipulate groups [apigroup:user.openshift.io][apigroup:authorization.openshift.io][apigroup:project.openshift.io]": " [Suite:openshift/conformance/parallel]",
 
-	"[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive] [OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings] external IdP is configured [Skipped] with invalid specified UID or Extra claim mappings should reject admission when Extra claim expression is not compilable CEL": "",
+	"[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive] [OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings] external IdP is configured with invalid specified UID or Extra claim mappings should reject admission when Extra claim expression is not compilable CEL": "",
 
-	"[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive] [OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings] external IdP is configured [Skipped] with invalid specified UID or Extra claim mappings should reject admission when UID claim expression is not compilable CEL": "",
+	"[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive] [OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings] external IdP is configured with invalid specified UID or Extra claim mappings should reject admission when UID claim expression is not compilable CEL": "",
 
 	"[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive] [OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings] external IdP is configured with valid specified UID or Extra claim mappings checking cluster identity mapping should map Extra correctly": "",
 
@@ -475,8 +475,6 @@ var Annotations = map[string]string{
 
 	"[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive] [OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings] external IdP is configured without specified UID or Extra claim mappings should default UID to the 'sub' claim in the access token from the IdP": "",
 
-	"[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive] [OCPFeatureGate:ExternalOIDC] external IdP is configured [Skipped] should remove the OpenShift OAuth stack": "",
-
 	"[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive] [OCPFeatureGate:ExternalOIDC] external IdP is configured should accept authentication via a certificate-based kubeconfig (break-glass)": "",
 
 	"[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive] [OCPFeatureGate:ExternalOIDC] external IdP is configured should configure kube-apiserver": "",
@@ -485,6 +483,8 @@ var Annotations = map[string]string{
 
 	"[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive] [OCPFeatureGate:ExternalOIDC] external IdP is configured should not accept tokens provided by the OAuth server": "",
 
+	"[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive] [OCPFeatureGate:ExternalOIDC] external IdP is configured should remove the OpenShift OAuth stack": "",
+
 	"[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive] [OCPFeatureGate:ExternalOIDC] reverting to IntegratedOAuth should accept tokens provided by the OpenShift OAuth server": "",
 
 	"[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive] [OCPFeatureGate:ExternalOIDC] reverting to IntegratedOAuth should not accept tokens provided by an external IdP": "",
diff --git a/zz_generated.manifests/test-reporting.yaml b/zz_generated.manifests/test-reporting.yaml
index 2d34befbcec3..3593e0a58771 100644
--- a/zz_generated.manifests/test-reporting.yaml
+++ b/zz_generated.manifests/test-reporting.yaml
@@ -336,9 +336,6 @@ spec:
         when enabled'
   - featureGate: ExternalOIDC
     tests:
-    - testName: '[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive]
-        [OCPFeatureGate:ExternalOIDC] external IdP is configured [Skipped] should
-        remove the OpenShift OAuth stack'
     - testName: '[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive]
         [OCPFeatureGate:ExternalOIDC] external IdP is configured should accept authentication
         via a certificate-based kubeconfig (break-glass)'
@@ -351,6 +348,9 @@ spec:
     - testName: '[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive]
         [OCPFeatureGate:ExternalOIDC] external IdP is configured should not accept
         tokens provided by the OAuth server'
+    - testName: '[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive]
+        [OCPFeatureGate:ExternalOIDC] external IdP is configured should remove the
+        OpenShift OAuth stack'
     - testName: '[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive]
         [OCPFeatureGate:ExternalOIDC] reverting to IntegratedOAuth should accept tokens
         provided by the OpenShift OAuth server'
@@ -367,12 +367,12 @@ spec:
     tests:
     - testName: '[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive]
         [OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings] external IdP is
-        configured [Skipped] with invalid specified UID or Extra claim mappings should
-        reject admission when Extra claim expression is not compilable CEL'
+        configured with invalid specified UID or Extra claim mappings should reject
+        admission when Extra claim expression is not compilable CEL'
     - testName: '[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive]
         [OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings] external IdP is
-        configured [Skipped] with invalid specified UID or Extra claim mappings should
-        reject admission when UID claim expression is not compilable CEL'
+        configured with invalid specified UID or Extra claim mappings should reject
+        admission when UID claim expression is not compilable CEL'
     - testName: '[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow][Disruptive]
         [OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings] external IdP is
         configured with valid specified UID or Extra claim mappings checking cluster