diff --git a/plugin/health_check_test.go b/plugin/health_check_test.go
index c3dba3aad1..374f52ff79 100644
--- a/plugin/health_check_test.go
+++ b/plugin/health_check_test.go
@@ -19,8 +19,7 @@ import (
 func TestPluginHealthCheck(t *testing.T) {
 	for name, f := range map[string]func(*testing.T){
 		"PluginHealthCheck_Success": testPluginHealthCheck_Success,
-		// "PluginHealthCheck_PluginPanicProcessCheck": testPluginHealthCheck_PluginPanicProcessCheck,
-		// "PluginHealthCheck_RPCPingFail":             testPluginHealthCheck_RPCPingFail,
+		"PluginHealthCheck_Panic":   testPluginHealthCheck_Panic,
 	} {
 		t.Run(name, f)
 	}
@@ -67,7 +66,7 @@ func testPluginHealthCheck_Success(t *testing.T) {
 	require.Nil(t, err)
 }
 
-func testPluginHealthCheck_PluginPanicProcessCheck(t *testing.T) {
+func testPluginHealthCheck_Panic(t *testing.T) {
 	dir, err := ioutil.TempDir("", "")
 	require.NoError(t, err)
 	defer os.RemoveAll(dir)
@@ -113,60 +112,9 @@ func testPluginHealthCheck_PluginPanicProcessCheck(t *testing.T) {
 	require.Nil(t, err)
 
 	supervisor.hooks.MessageWillBePosted(&Context{}, &model.Post{})
-	time.Sleep(10 * time.Millisecond)
 
 	err = supervisor.PerformHealthCheck()
 	require.NotNil(t, err)
-	require.Equal(t, "Plugin process not found, or not responding", err.Error())
-}
-
-func testPluginHealthCheck_RPCPingFail(t *testing.T) {
-	dir, err := ioutil.TempDir("", "")
-	require.NoError(t, err)
-	defer os.RemoveAll(dir)
-
-	backend := filepath.Join(dir, "backend.exe")
-	utils.CompileGo(t, `
-		package main
-
-		import (
-			"github.com/mattermost/mattermost-server/plugin"
-		)
-
-		type MyPlugin struct {
-			plugin.MattermostPlugin
-		}
-
-		func main() {
-			plugin.ClientMain(&MyPlugin{})
-		}
-	`, backend)
-
-	err = ioutil.WriteFile(filepath.Join(dir, "plugin.json"), []byte(`{"id": "foo", "backend": {"executable": "backend.exe"}}`), 0600)
-	require.NoError(t, err)
-
-	bundle := model.BundleInfoForPath(dir)
-	log := mlog.NewLogger(&mlog.LoggerConfiguration{
-		EnableConsole: true,
-		ConsoleJson:   true,
-		ConsoleLevel:  "error",
-		EnableFile:    false,
-	})
-
-	supervisor, err := newSupervisor(bundle, log, nil)
-	require.Nil(t, err)
-	require.NotNil(t, supervisor)
-
-	err = supervisor.PerformHealthCheck()
-	require.Nil(t, err)
-
-	c, err := supervisor.client.Client()
-	require.Nil(t, err)
-	c.Close()
-
-	err = supervisor.PerformHealthCheck()
-	require.NotNil(t, err)
-	require.Equal(t, "Plugin RPC connection is not responding", err.Error())
 }
 
 func TestShouldDeactivatePlugin(t *testing.T) {