diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures
index ede50e41026..db22d8ee07c 100644
--- a/hack/.staticcheck_failures
+++ b/hack/.staticcheck_failures
@@ -45,7 +45,6 @@ test/e2e/apps
 test/e2e/autoscaling
 test/e2e/instrumentation/logging/stackdriver
 test/integration/deployment
-test/integration/etcd
 test/integration/examples
 test/integration/framework
 test/integration/garbagecollector
diff --git a/test/integration/etcd/server.go b/test/integration/etcd/server.go
index 29f0a1c9ba8..a7817365d43 100644
--- a/test/integration/etcd/server.go
+++ b/test/integration/etcd/server.go
@@ -135,10 +135,10 @@ func StartRealMasterOrDie(t *testing.T, configFuncs ...func(*options.ServerRunOp
 
 		prepared, err := kubeAPIServer.PrepareRun()
 		if err != nil {
-			t.Fatal(err)
+			t.Error(err)
 		}
 		if err := prepared.Run(stopCh); err != nil {
-			t.Fatal(err)
+			t.Error(err)
 		}
 	}()
 
@@ -174,7 +174,7 @@ func StartRealMasterOrDie(t *testing.T, configFuncs ...func(*options.ServerRunOp
 	restMapper := restmapper.NewDeferredDiscoveryRESTMapper(discoveryClient)
 	restMapper.Reset()
 
-	serverResources, err := kubeClient.Discovery().ServerResources()
+	_, serverResources, err := kubeClient.Discovery().ServerGroupsAndResources()
 	if err != nil {
 		t.Fatal(err)
 	}