diff --git a/cmd/mattermost/commands/server_test.go b/cmd/mattermost/commands/server_test.go
index a468b85561..ba039c9ca1 100644
--- a/cmd/mattermost/commands/server_test.go
+++ b/cmd/mattermost/commands/server_test.go
@@ -20,12 +20,14 @@ const (
 	UnitTestListeningPort = ":0"
 )
 
+//nolint:golint,unused
 type ServerTestHelper struct {
 	disableConfigWatch bool
 	interruptChan      chan os.Signal
 	originalInterval   int
 }
 
+//nolint:golint,unused
 func SetupServerTest(t testing.TB) *ServerTestHelper {
 	if testing.Short() {
 		t.SkipNow()
@@ -50,11 +52,13 @@ func SetupServerTest(t testing.TB) *ServerTestHelper {
 	return th
 }
 
+//nolint:golint,unused
 func (th *ServerTestHelper) TearDownServerTest() {
 	jobs.DefaultWatcherPollingInterval = th.originalInterval
 }
 
 func TestRunServerSuccess(t *testing.T) {
+	t.Skip("MM-34557")
 	th := SetupServerTest(t)
 	defer th.TearDownServerTest()
 
@@ -68,6 +72,7 @@ func TestRunServerSuccess(t *testing.T) {
 }
 
 func TestRunServerSystemdNotification(t *testing.T) {
+	t.Skip("MM-34557")
 	th := SetupServerTest(t)
 	defer th.TearDownServerTest()
 
@@ -123,6 +128,7 @@ func TestRunServerSystemdNotification(t *testing.T) {
 }
 
 func TestRunServerNoSystemd(t *testing.T) {
+	t.Skip("MM-34557")
 	th := SetupServerTest(t)
 	defer th.TearDownServerTest()