diff --git a/server/.golangci.yml b/server/.golangci.yml
index f4e7eb3a20..72832568c4 100644
--- a/server/.golangci.yml
+++ b/server/.golangci.yml
@@ -83,7 +83,6 @@ issues:
         channels/api4/license_local.go|\
         channels/api4/oauth_test.go|\
         channels/api4/plugin.go|\
-        channels/api4/plugin_test.go|\
         channels/api4/post_test.go|\
         channels/api4/preference_test.go|\
         channels/api4/reaction_test.go|\
diff --git a/server/channels/api4/plugin_test.go b/server/channels/api4/plugin_test.go
index ace63b52be..bd6667d805 100644
--- a/server/channels/api4/plugin_test.go
+++ b/server/channels/api4/plugin_test.go
@@ -39,7 +39,8 @@ func TestPlugin(t *testing.T) {
 		statesJson, err := json.Marshal(th.App.Config().PluginSettings.PluginStates)
 		require.NoError(t, err)
 		states := map[string]*model.PluginState{}
-		json.Unmarshal(statesJson, &states)
+		err = json.Unmarshal(statesJson, &states)
+		require.NoError(t, err)
 		th.App.UpdateConfig(func(cfg *model.Config) {
 			*cfg.PluginSettings.Enable = true
 			*cfg.PluginSettings.EnableUploads = true
@@ -53,7 +54,8 @@ func TestPlugin(t *testing.T) {
 		// Install from URL
 		testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
 			res.WriteHeader(http.StatusOK)
-			res.Write(tarData)
+			_, err = res.Write(tarData)
+			require.NoError(t, err)
 		}))
 		defer func() { testServer.Close() }()
 
@@ -79,8 +81,6 @@ func TestPlugin(t *testing.T) {
 		_, err = client.RemovePlugin(context.Background(), manifest.Id)
 		require.NoError(t, err)
 
-		th.App.Channels().RemovePlugin(manifest.Id)
-
 		th.App.UpdateConfig(func(cfg *model.Config) { *cfg.PluginSettings.Enable = false })
 
 		_, resp, err = client.InstallPluginFromURL(context.Background(), url, false)
@@ -531,7 +531,8 @@ func TestGetMarketplacePlugins(t *testing.T) {
 			res.WriteHeader(http.StatusOK)
 			json, err := json.Marshal([]*model.MarketplacePlugin{})
 			require.NoError(t, err)
-			res.Write(json)
+			_, err = res.Write(json)
+			require.NoError(t, err)
 		}))
 		defer func() { testServer.Close() }()
 
@@ -556,7 +557,8 @@ func TestGetMarketplacePlugins(t *testing.T) {
 			res.WriteHeader(http.StatusOK)
 			json, err := json.Marshal([]*model.MarketplacePlugin{})
 			require.NoError(t, err)
-			res.Write(json)
+			_, err = res.Write(json)
+			require.NoError(t, err)
 		}))
 		defer func() { testServer.Close() }()
 
@@ -580,7 +582,8 @@ func TestGetMarketplacePlugins(t *testing.T) {
 			res.WriteHeader(http.StatusOK)
 			json, err := json.Marshal([]*model.MarketplacePlugin{})
 			require.NoError(t, err)
-			res.Write(json)
+			_, err = res.Write(json)
+			require.NoError(t, err)
 		}))
 		defer func() { testServer.Close() }()
 
@@ -604,7 +607,8 @@ func TestGetMarketplacePlugins(t *testing.T) {
 			res.WriteHeader(http.StatusOK)
 			json, err := json.Marshal([]*model.MarketplacePlugin{})
 			require.NoError(t, err)
-			res.Write(json)
+			_, err = res.Write(json)
+			require.NoError(t, err)
 		}))
 		defer func() { testServer.Close() }()
 
@@ -633,7 +637,8 @@ func TestGetMarketplacePlugins(t *testing.T) {
 			res.WriteHeader(http.StatusOK)
 			json, err := json.Marshal([]*model.MarketplacePlugin{})
 			require.NoError(t, err)
-			res.Write(json)
+			_, err = res.Write(json)
+			require.NoError(t, err)
 		}))
 		defer func() { testServer.Close() }()
 
@@ -659,7 +664,8 @@ func TestGetMarketplacePlugins(t *testing.T) {
 			res.WriteHeader(http.StatusOK)
 			json, err := json.Marshal([]*model.MarketplacePlugin{})
 			require.NoError(t, err)
-			res.Write(json)
+			_, err = res.Write(json)
+			require.NoError(t, err)
 		}))
 		defer func() { testServer.Close() }()
 
@@ -683,7 +689,8 @@ func TestGetMarketplacePlugins(t *testing.T) {
 			res.WriteHeader(http.StatusOK)
 			json, err := json.Marshal([]*model.MarketplacePlugin{})
 			require.NoError(t, err)
-			res.Write(json)
+			_, err = res.Write(json)
+			require.NoError(t, err)
 		}))
 		defer func() { testServer.Close() }()
 
@@ -737,7 +744,8 @@ func TestGetInstalledMarketplacePlugins(t *testing.T) {
 			res.WriteHeader(http.StatusOK)
 			json, err := json.Marshal(samplePlugins)
 			require.NoError(t, err)
-			res.Write(json)
+			_, err = res.Write(json)
+			require.NoError(t, err)
 		}))
 		defer func() { testServer.Close() }()
 
@@ -822,7 +830,8 @@ func TestGetInstalledMarketplacePlugins(t *testing.T) {
 			var out []byte
 			out, err = json.Marshal([]*model.MarketplacePlugin{samplePlugins[0], newPlugin})
 			require.NoError(t, err)
-			res.Write(out)
+			_, err = res.Write(out)
+			require.NoError(t, err)
 		}))
 		defer func() { testServer.Close() }()
 		th.App.UpdateConfig(func(cfg *model.Config) {
@@ -882,7 +891,8 @@ func TestSearchGetMarketplacePlugins(t *testing.T) {
 			res.WriteHeader(http.StatusOK)
 			json, err := json.Marshal(samplePlugins)
 			require.NoError(t, err)
-			res.Write(json)
+			_, err = res.Write(json)
+			require.NoError(t, err)
 		}))
 		defer func() { testServer.Close() }()
 
@@ -994,7 +1004,8 @@ func TestGetLocalPluginInMarketplace(t *testing.T) {
 		res.WriteHeader(http.StatusOK)
 		json, err := json.Marshal([]*model.MarketplacePlugin{samplePlugins[0]})
 		require.NoError(t, err)
-		res.Write(json)
+		_, err = res.Write(json)
+		require.NoError(t, err)
 	}))
 	defer testServer.Close()
 
@@ -1155,7 +1166,8 @@ func TestGetRemotePluginInMarketplace(t *testing.T) {
 		res.WriteHeader(http.StatusOK)
 		json, err := json.Marshal([]*model.MarketplacePlugin{samplePlugins[0]})
 		require.NoError(t, err)
-		res.Write(json)
+		_, err = res.Write(json)
+		require.NoError(t, err)
 	}))
 	defer testServer.Close()
 
@@ -1211,7 +1223,8 @@ func TestGetPrepackagedPluginInMarketplace(t *testing.T) {
 		res.WriteHeader(http.StatusOK)
 		json, err := json.Marshal([]*model.MarketplacePlugin{marketplacePlugins[0]})
 		require.NoError(t, err)
-		res.Write(json)
+		_, err = res.Write(json)
+		require.NoError(t, err)
 	}))
 	defer testServer.Close()
 
@@ -1324,7 +1337,8 @@ func TestGetPrepackagedPlaybooksPluginIn(t *testing.T) {
 		res.WriteHeader(http.StatusOK)
 		json, err := json.Marshal([]*model.MarketplacePlugin{})
 		require.NoError(t, err)
-		res.Write(json)
+		_, err = res.Write(json)
+		require.NoError(t, err)
 	}))
 	defer testServer.Close()
 
@@ -1410,7 +1424,8 @@ func TestInstallMarketplacePlugin(t *testing.T) {
 	require.NoError(t, err)
 	pluginServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
 		res.WriteHeader(http.StatusOK)
-		res.Write(tarData)
+		_, err = res.Write(tarData)
+		require.NoError(t, err)
 	}))
 	defer pluginServer.Close()
 
@@ -1506,7 +1521,8 @@ func TestInstallMarketplacePlugin(t *testing.T) {
 			res.WriteHeader(http.StatusOK)
 			json, err := json.Marshal([]*model.MarketplacePlugin{})
 			require.NoError(t, err)
-			res.Write(json)
+			_, err = res.Write(json)
+			require.NoError(t, err)
 		}))
 		defer testServer.Close()
 
@@ -1526,7 +1542,8 @@ func TestInstallMarketplacePlugin(t *testing.T) {
 			res.WriteHeader(http.StatusOK)
 			json, err := json.Marshal([]*model.MarketplacePlugin{samplePlugins[0]})
 			require.NoError(t, err)
-			res.Write(json)
+			_, err = res.Write(json)
+			require.NoError(t, err)
 		}))
 		defer testServer.Close()
 
@@ -1550,7 +1567,8 @@ func TestInstallMarketplacePlugin(t *testing.T) {
 			res.WriteHeader(http.StatusOK)
 			json, err := json.Marshal([]*model.MarketplacePlugin{samplePlugins[1]})
 			require.NoError(t, err)
-			res.Write(json)
+			_, err = res.Write(json)
+			require.NoError(t, err)
 		}))
 		defer testServer.Close()
 
@@ -1595,7 +1613,8 @@ func TestInstallMarketplacePlugin(t *testing.T) {
 			res.WriteHeader(http.StatusOK)
 			json, err := json.Marshal([]*model.MarketplacePlugin{samplePlugins[1]})
 			require.NoError(t, err)
-			res.Write(json)
+			_, err = res.Write(json)
+			require.NoError(t, err)
 		}))
 		defer testServer.Close()
 
@@ -1752,7 +1771,8 @@ func TestInstallMarketplacePluginPrepackagedDisabled(t *testing.T) {
 	require.NoError(t, err)
 	pluginServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
 		res.WriteHeader(http.StatusOK)
-		res.Write(tarData)
+		_, err = res.Write(tarData)
+		require.NoError(t, err)
 	}))
 	defer pluginServer.Close()
 
@@ -1843,7 +1863,8 @@ func TestInstallMarketplacePluginPrepackagedDisabled(t *testing.T) {
 					require.NoError(t, err)
 				}
 
-				res.Write(out)
+				_, err = res.Write(out)
+				require.NoError(t, err)
 			}))
 			defer testServer.Close()
 
@@ -2011,7 +2032,8 @@ func TestInstallMarketplacePluginPrepackagedDisabled(t *testing.T) {
 				var out []byte
 				out, err = json.Marshal(mPlugins)
 				require.NoError(t, err)
-				res.Write(out)
+				_, err = res.Write(out)
+				require.NoError(t, err)
 			}))
 			defer testServer.Close()
 
@@ -2087,7 +2109,8 @@ func TestPluginWebSocketSession(t *testing.T) {
 	require.NoError(t, err)
 	backend := filepath.Join(pluginDir, pluginID, "backend.exe")
 	utils.CompileGo(t, string(pluginCode), backend)
-	os.WriteFile(filepath.Join(pluginDir, pluginID, "plugin.json"), []byte(`{"id": "`+pluginID+`", "server": {"executable": "backend.exe"}}`), 0600)
+	err = os.WriteFile(filepath.Join(pluginDir, pluginID, "plugin.json"), []byte(`{"id": "`+pluginID+`", "server": {"executable": "backend.exe"}}`), 0600)
+	require.NoError(t, err)
 
 	// Activate the plugin
 	manifest, activated, reterr := th.App.GetPluginsEnvironment().Activate(pluginID)
@@ -2138,7 +2161,8 @@ func TestPluginWebSocketRemoteAddress(t *testing.T) {
 	require.NoError(t, err)
 	backend := filepath.Join(pluginDir, pluginID, "backend.exe")
 	utils.CompileGo(t, string(pluginCode), backend)
-	os.WriteFile(filepath.Join(pluginDir, pluginID, "plugin.json"), []byte(`{"id": "`+pluginID+`", "server": {"executable": "backend.exe"}}`), 0600)
+	err = os.WriteFile(filepath.Join(pluginDir, pluginID, "plugin.json"), []byte(`{"id": "`+pluginID+`", "server": {"executable": "backend.exe"}}`), 0600)
+	require.NoError(t, err)
 
 	// Activate the plugin
 	manifest, activated, reterr := th.App.GetPluginsEnvironment().Activate(pluginID)