diff --git a/server/.golangci.yml b/server/.golangci.yml
index 962797ff52..718e95c3b8 100644
--- a/server/.golangci.yml
+++ b/server/.golangci.yml
@@ -117,7 +117,6 @@ issues:
         channels/app/migrations.go|\
         channels/app/notification_push.go|\
         channels/app/notification_test.go|\
-        channels/app/oauth_test.go|\
         channels/app/onboarding_test.go|\
         channels/app/opengraph_test.go|\
         channels/app/permissions.go|\
diff --git a/server/channels/app/oauth_test.go b/server/channels/app/oauth_test.go
index 1b7fe1fdcd..ee5fc9bf4f 100644
--- a/server/channels/app/oauth_test.go
+++ b/server/channels/app/oauth_test.go
@@ -318,7 +318,8 @@ func TestAuthorizeOAuthUser(t *testing.T) {
 
 	t.Run("with an invalid token response", func(t *testing.T) {
 		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.Write([]byte("invalid"))
+			_, err := w.Write([]byte("invalid"))
+			require.NoError(t, err)
 		}))
 		defer server.Close()
 
@@ -337,10 +338,11 @@ func TestAuthorizeOAuthUser(t *testing.T) {
 
 	t.Run("with an invalid token type", func(t *testing.T) {
 		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			json.NewEncoder(w).Encode(&model.AccessResponse{
+			err := json.NewEncoder(w).Encode(&model.AccessResponse{
 				AccessToken: model.NewId(),
 				TokenType:   "",
 			})
+			require.NoError(t, err)
 		}))
 		defer server.Close()
 
@@ -358,10 +360,11 @@ func TestAuthorizeOAuthUser(t *testing.T) {
 
 	t.Run("with an empty token response", func(t *testing.T) {
 		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			json.NewEncoder(w).Encode(&model.AccessResponse{
+			err := json.NewEncoder(w).Encode(&model.AccessResponse{
 				AccessToken: "",
 				TokenType:   model.AccessTokenType,
 			})
+			require.NoError(t, err)
 		}))
 		defer server.Close()
 
@@ -379,10 +382,11 @@ func TestAuthorizeOAuthUser(t *testing.T) {
 
 	t.Run("with an incorrect user endpoint", func(t *testing.T) {
 		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			json.NewEncoder(w).Encode(&model.AccessResponse{
+			err := json.NewEncoder(w).Encode(&model.AccessResponse{
 				AccessToken: model.NewId(),
 				TokenType:   model.AccessTokenType,
 			})
+			require.NoError(t, err)
 		}))
 		defer server.Close()
 
@@ -403,10 +407,11 @@ func TestAuthorizeOAuthUser(t *testing.T) {
 			switch r.URL.Path {
 			case "/token":
 				t.Log("hit token")
-				json.NewEncoder(w).Encode(&model.AccessResponse{
+				err := json.NewEncoder(w).Encode(&model.AccessResponse{
 					AccessToken: model.NewId(),
 					TokenType:   model.AccessTokenType,
 				})
+				require.NoError(t, err)
 			case "/user":
 				t.Log("hit user")
 				w.WriteHeader(http.StatusTeapot)
@@ -431,14 +436,16 @@ func TestAuthorizeOAuthUser(t *testing.T) {
 			switch r.URL.Path {
 			case "/token":
 				t.Log("hit token")
-				json.NewEncoder(w).Encode(&model.AccessResponse{
+				err := json.NewEncoder(w).Encode(&model.AccessResponse{
 					AccessToken: model.NewId(),
 					TokenType:   model.AccessTokenType,
 				})
+				require.NoError(t, err)
 			case "/user":
 				t.Log("hit user")
 				w.WriteHeader(http.StatusForbidden)
-				w.Write([]byte("Terms of Service"))
+				_, err := w.Write([]byte("Terms of Service"))
+				require.NoError(t, err)
 			}
 		}))
 		defer server.Close()
@@ -489,13 +496,15 @@ func TestAuthorizeOAuthUser(t *testing.T) {
 				server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 					switch r.URL.Path {
 					case "/token":
-						json.NewEncoder(w).Encode(&model.AccessResponse{
+						err := json.NewEncoder(w).Encode(&model.AccessResponse{
 							AccessToken: model.NewId(),
 							TokenType:   model.AccessTokenType,
 						})
+						require.NoError(t, err)
 					case "/user":
 						w.WriteHeader(http.StatusOK)
-						w.Write([]byte(userData))
+						_, err := w.Write([]byte(userData))
+						require.NoError(t, err)
 					}
 				}))
 				defer server.Close()