diff --git a/test/e2e/framework/helper/validation/certificatesigningrequests/certificatesigningrequests.go b/test/e2e/framework/helper/validation/certificatesigningrequests/certificatesigningrequests.go
index d82dfd35a..14768d505 100644
--- a/test/e2e/framework/helper/validation/certificatesigningrequests/certificatesigningrequests.go
+++ b/test/e2e/framework/helper/validation/certificatesigningrequests/certificatesigningrequests.go
@@ -84,7 +84,7 @@ func ExpectValidPrivateKeyData(csr *certificatesv1.CertificateSigningRequest, ke
 			return pub.Equal(cert.PublicKey), nil
 		case *ecdsa.PublicKey:
 			return pub.Equal(cert.PublicKey), nil
-		case *ed25519.PublicKey:
+		case ed25519.PublicKey:
 			return pub.Equal(cert.PublicKey), nil
 		default:
 			return false, fmt.Errorf("Unrecognised public key type: %T", key)
diff --git a/test/e2e/suite/conformance/certificatesigningrequests/tests.go b/test/e2e/suite/conformance/certificatesigningrequests/tests.go
index f91576b17..b961d6aa0 100644
--- a/test/e2e/suite/conformance/certificatesigningrequests/tests.go
+++ b/test/e2e/suite/conformance/certificatesigningrequests/tests.go
@@ -67,7 +67,7 @@ func (s *Suite) Define() {
 
 		sharedCommonName := s.newDomain()
 
-		tests := map[string]struct {
+		type testCase struct {
 			keyAlgo            x509.PublicKeyAlgorithm
 			csrModifiers       []gen.CSRModifier
 			kubeCSRUsages      []certificatesv1.KeyUsage
@@ -78,7 +78,9 @@ func (s *Suite) Define() {
 			// Extra validations which may be needed for testing, on a test case by
 			// case basis. All default validations will be run on every test.
 			extraValidations []certificatesigningrequests.ValidationFunc
-		}{
+		}
+
+		tests := map[string]testCase{
 			"should issue an RSA certificate for a single distinct DNS Name": {
 				keyAlgo:      x509.RSA,
 				csrModifiers: []gen.CSRModifier{gen.SetCSRDNSNames(s.newDomain())},
@@ -297,7 +299,7 @@ func (s *Suite) Define() {
 			},
 		}
 
-		for name, test := range tests {
+		defineTest := func(name string, test testCase) {
 			s.it(f, name, func(signerName string) {
 				// Generate request CSR
 				csr, key, err := gen.CSR(test.keyAlgo, test.csrModifiers...)
@@ -357,5 +359,9 @@ func (s *Suite) Define() {
 				Expect(err).NotTo(HaveOccurred())
 			}, test.requiredFeatures...)
 		}
+
+		for name := range tests {
+			defineTest(name, tests[name])
+		}
 	})
 }