diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures
index 96df3b8dec1..3f883674116 100644
--- a/hack/.staticcheck_failures
+++ b/hack/.staticcheck_failures
@@ -31,10 +31,7 @@ vendor/k8s.io/apiserver/pkg/registry/rest/resttest
 vendor/k8s.io/apiserver/pkg/server/dynamiccertificates
 vendor/k8s.io/apiserver/pkg/server/filters
 vendor/k8s.io/apiserver/pkg/server/httplog
-vendor/k8s.io/apiserver/pkg/server/options
-vendor/k8s.io/apiserver/pkg/server/options/encryptionconfig
 vendor/k8s.io/apiserver/pkg/server/routes
-vendor/k8s.io/apiserver/pkg/server/storage
 vendor/k8s.io/apiserver/pkg/storage
 vendor/k8s.io/apiserver/pkg/storage/cacher
 vendor/k8s.io/apiserver/pkg/storage/etcd3
diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/audit.go b/staging/src/k8s.io/apiserver/pkg/server/options/audit.go
index c3a709dcf10..cb8b7bc21e2 100644
--- a/staging/src/k8s.io/apiserver/pkg/server/options/audit.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/options/audit.go
@@ -308,7 +308,8 @@ func (o *AuditOptions) ApplyTo(
 			klog.V(2).Info("No audit policy file provided, no events will be recorded for webhook backend")
 		} else {
 			if c.EgressSelector != nil {
-				egressDialer, err := c.EgressSelector.Lookup(egressselector.ControlPlane.AsNetworkContext())
+				var egressDialer utilnet.DialFunc
+				egressDialer, err = c.EgressSelector.Lookup(egressselector.ControlPlane.AsNetworkContext())
 				if err != nil {
 					return err
 				}
diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config.go b/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config.go
index 372ab5eb8a6..09659676ac5 100644
--- a/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config.go
@@ -241,7 +241,8 @@ func prefixTransformers(config *apiserverconfig.ResourceConfiguration) ([]value.
 		case provider.Secretbox != nil:
 			transformer, err = secretboxPrefixTransformer(provider.Secretbox)
 		case provider.KMS != nil:
-			envelopeService, err := envelopeServiceFactory(provider.KMS.Endpoint, provider.KMS.Timeout.Duration)
+			var envelopeService envelope.Service
+			envelopeService, err = envelopeServiceFactory(provider.KMS.Endpoint, provider.KMS.Timeout.Duration)
 			if err != nil {
 				return nil, fmt.Errorf("could not configure KMS plugin %q, error: %v", provider.KMS.Name, err)
 			}
diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/serving_test.go b/staging/src/k8s.io/apiserver/pkg/server/options/serving_test.go
index 53a8f601bfa..2e811653dee 100644
--- a/staging/src/k8s.io/apiserver/pkg/server/options/serving_test.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/options/serving_test.go
@@ -76,7 +76,6 @@ func TestServerRunWithSNI(t *testing.T) {
 
 		// optional ip or hostname to pass to NewLoopbackClientConfig
 		LoopbackClientBindAddressOverride string
-		ExpectLoopbackClientError         bool
 	}{
 		"only one cert": {
 			Cert: TestCertSpec{
@@ -314,9 +313,10 @@ func TestServerRunWithSNI(t *testing.T) {
 				return nil
 			})
 			preparedServer := s.PrepareRun()
+			preparedServerErrors := make(chan error)
 			go func() {
 				if err := preparedServer.Run(stopCh); err != nil {
-					t.Fatal(err)
+					preparedServerErrors <- err
 				}
 			}()
 
@@ -356,15 +356,7 @@ func TestServerRunWithSNI(t *testing.T) {
 				host = test.LoopbackClientBindAddressOverride
 			}
 			s.LoopbackClientConfig.Host = net.JoinHostPort(host, strconv.Itoa(secureOptions.BindPort))
-			if test.ExpectLoopbackClientError {
-				if err == nil {
-					t.Fatalf("expected error creating loopback client config")
-				}
-				return
-			}
-			if err != nil {
-				t.Fatalf("failed creating loopback client config: %v", err)
-			}
+
 			client, err := discovery.NewDiscoveryClientForConfig(s.LoopbackClientConfig)
 			if err != nil {
 				t.Fatalf("failed to create loopback client: %v", err)
@@ -376,6 +368,12 @@ func TestServerRunWithSNI(t *testing.T) {
 			if expected := &v; !reflect.DeepEqual(got, expected) {
 				t.Errorf("loopback client didn't get correct version info: expected=%v got=%v", expected, got)
 			}
+
+			select {
+			case err := <-preparedServerErrors:
+				t.Fatalf("preparedServer failed with error: %v", err)
+			default:
+			}
 		})
 	}
 }
diff --git a/staging/src/k8s.io/apiserver/pkg/server/storage/storage_factory_test.go b/staging/src/k8s.io/apiserver/pkg/server/storage/storage_factory_test.go
index 8bbbbb9ff34..e0f07f24f6c 100644
--- a/staging/src/k8s.io/apiserver/pkg/server/storage/storage_factory_test.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/storage/storage_factory_test.go
@@ -35,9 +35,8 @@ import (
 var (
 	v1GroupVersion = schema.GroupVersion{Group: "", Version: "v1"}
 
-	scheme         = runtime.NewScheme()
-	codecs         = serializer.NewCodecFactory(scheme)
-	parameterCodec = runtime.NewParameterCodec(scheme)
+	scheme = runtime.NewScheme()
+	codecs = serializer.NewCodecFactory(scheme)
 )
 
 func init() {