diff --git a/api4/channel_test.go b/api4/channel_test.go
index 8ff7a96753..893c69bfcc 100644
--- a/api4/channel_test.go
+++ b/api4/channel_test.go
@@ -2931,6 +2931,7 @@ func TestGetChannelMembersTimezones(t *testing.T) {
 
 	user.Timezone["manualTimezone"] = ""
 	_, resp = Client.UpdateUser(user)
+	CheckNoError(t, resp)
 
 	timezone, resp = Client.GetChannelMembersTimezones(th.BasicChannel.Id)
 	CheckNoError(t, resp)
diff --git a/api4/emoji_test.go b/api4/emoji_test.go
index 031f6d50a3..0769cb7561 100644
--- a/api4/emoji_test.go
+++ b/api4/emoji_test.go
@@ -14,6 +14,7 @@ import (
 	"github.com/mattermost/mattermost-server/utils"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestCreateEmoji(t *testing.T) {
@@ -238,10 +239,8 @@ func TestGetEmojiList(t *testing.T) {
 			found = true
 			break
 		}
-		if found {
-			t.Fatalf("should not get a deleted emoji %v", emojis[0].Id)
-		}
 	}
+	require.Falsef(t, found, "should not get a deleted emoji %v", emojis[0].Id)
 
 	listEmoji, resp = Client.GetEmojiList(0, 1)
 	CheckNoError(t, resp)
diff --git a/api4/user_test.go b/api4/user_test.go
index 4628be1fa3..ea710dc8f3 100644
--- a/api4/user_test.go
+++ b/api4/user_test.go
@@ -1379,6 +1379,7 @@ func TestGetUsersByGroupChannelIds(t *testing.T) {
 
 	th.LoginBasic2()
 	usersByChannelId, resp = th.Client.GetUsersByGroupChannelIds([]string{gc1.Id})
+	CheckNoError(t, resp)
 
 	_, ok := usersByChannelId[gc1.Id]
 	require.False(t, ok)
@@ -4425,6 +4426,7 @@ func TestRegisterTermsOfServiceAction(t *testing.T) {
 
 	success, resp := th.Client.RegisterTermsOfServiceAction(th.BasicUser.Id, "st_1", true)
 	CheckErrorMessage(t, resp, "store.sql_terms_of_service_store.get.no_rows.app_error")
+	assert.Nil(t, success)
 
 	termsOfService, err := th.App.CreateTermsOfService("terms of service", th.BasicUser.Id)
 	if err != nil {
diff --git a/app/bot_test.go b/app/bot_test.go
index 3d06a329eb..2b35ff4a9f 100644
--- a/app/bot_test.go
+++ b/app/bot_test.go
@@ -632,6 +632,7 @@ func TestSetBotIconImage(t *testing.T) {
 			Username: "username",
 			Id:       th.BasicUser.Id,
 		})
+		require.Nil(t, err)
 		defer th.App.PermanentDeleteBot(bot.UserId)
 
 		fpath := fmt.Sprintf("/bots/%v/icon.svg", bot.UserId)
@@ -683,6 +684,7 @@ func TestGetBotIconImage(t *testing.T) {
 			Username: "username",
 			Id:       th.BasicUser.Id,
 		})
+		require.Nil(t, err)
 		defer th.App.PermanentDeleteBot(bot.UserId)
 
 		svgFile.Seek(0, 0)
@@ -729,6 +731,7 @@ func TestDeleteBotIconImage(t *testing.T) {
 			Username: "username",
 			Id:       th.BasicUser.Id,
 		})
+		require.Nil(t, err)
 		defer th.App.PermanentDeleteBot(bot.UserId)
 
 		// Set icon
diff --git a/cmd/mattermost/commands/teamargs.go b/cmd/mattermost/commands/teamargs.go
index fe69e4576f..41950f96e8 100644
--- a/cmd/mattermost/commands/teamargs.go
+++ b/cmd/mattermost/commands/teamargs.go
@@ -21,7 +21,7 @@ func getTeamFromTeamArg(a *app.App, teamArg string) *model.Team {
 	var team *model.Team
 	team, err := a.Srv.Store.Team().GetByName(teamArg)
 
-	if team == nil {
+	if err != nil {
 		var t *model.Team
 		if t, err = a.Srv.Store.Team().Get(teamArg); err == nil {
 			team = t
diff --git a/config/file_test.go b/config/file_test.go
index a5be5b9671..fe5e80143b 100644
--- a/config/file_test.go
+++ b/config/file_test.go
@@ -198,6 +198,7 @@ func TestFileStoreGet(t *testing.T) {
 
 	newCfg := &model.Config{}
 	oldCfg, err := fs.Set(newCfg)
+	require.NoError(t, err)
 
 	assert.True(t, oldCfg == cfg, "returned config after set() changed original")
 	assert.False(t, newCfg == cfg, "returned config should have been different from original")
diff --git a/config/migrate.go b/config/migrate.go
index c6e9856e2c..a39cd10d59 100644
--- a/config/migrate.go
+++ b/config/migrate.go
@@ -42,6 +42,9 @@ func migrateFile(name string, source Store, destination Store) error {
 
 	if fileExists {
 		file, err := source.GetFile(name)
+		if err != nil {
+			return errors.Wrapf(err, "failed to migrate %s", name)
+		}
 		err = destination.SetFile(name, file)
 		if err != nil {
 			return errors.Wrapf(err, "failed to migrate %s", name)
diff --git a/model/file_info.go b/model/file_info.go
index 65555b6b93..25832b93c3 100644
--- a/model/file_info.go
+++ b/model/file_info.go
@@ -158,7 +158,7 @@ func GetInfoForBytes(name string, data []byte) (*FileInfo, *AppError) {
 				if gifConfig, err := gif.DecodeAll(bytes.NewReader(data)); err != nil {
 					// Still return the rest of the info even though it doesn't appear to be an actual gif
 					info.HasPreviewImage = true
-					err = NewAppError("GetInfoForBytes", "model.file_info.get.gif.app_error", nil, "name="+name, http.StatusBadRequest)
+					return info, NewAppError("GetInfoForBytes", "model.file_info.get.gif.app_error", nil, "name="+name, http.StatusBadRequest)
 				} else {
 					info.HasPreviewImage = len(gifConfig.Image) == 1
 				}
diff --git a/model/integration_action_test.go b/model/integration_action_test.go
index 2c7251af09..924997f721 100644
--- a/model/integration_action_test.go
+++ b/model/integration_action_test.go
@@ -24,6 +24,7 @@ func TestTriggerIdDecodeAndVerification(t *testing.T) {
 	t.Run("should succeed decoding and validation", func(t *testing.T) {
 		userId := NewId()
 		clientTriggerId, triggerId, err := GenerateTriggerId(userId, key)
+		require.Nil(t, err)
 		decodedClientTriggerId, decodedUserId, err := DecodeAndVerifyTriggerId(triggerId, key)
 		assert.Nil(t, err)
 		assert.Equal(t, clientTriggerId, decodedClientTriggerId)
@@ -35,6 +36,7 @@ func TestTriggerIdDecodeAndVerification(t *testing.T) {
 			UserId: NewId(),
 		}
 		clientTriggerId, triggerId, err := actionReq.GenerateTriggerId(key)
+		require.Nil(t, err)
 		dialogReq := &OpenDialogRequest{TriggerId: triggerId}
 		decodedClientTriggerId, decodedUserId, err := dialogReq.DecodeAndVerifyTriggerId(key)
 		assert.Nil(t, err)
diff --git a/model/link_metadata.go b/model/link_metadata.go
index 72f0178eb4..28c0fca826 100644
--- a/model/link_metadata.go
+++ b/model/link_metadata.go
@@ -56,9 +56,7 @@ func firstNImages(images []*opengraph.Image, maxImages int) []*opengraph.Image {
 	}
 	numImages := len(images)
 	if numImages > maxImages {
-		subImages := make([]*opengraph.Image, maxImages)
-		subImages = images[0:maxImages]
-		return subImages
+		return images[0:maxImages]
 	}
 	return images
 }
diff --git a/store/storetest/audit_store.go b/store/storetest/audit_store.go
index de7c18927c..a9a9dbb012 100644
--- a/store/storetest/audit_store.go
+++ b/store/storetest/audit_store.go
@@ -40,11 +40,11 @@ func testAuditStore(t *testing.T, ss store.Store) {
 	assert.Equal(t, "extra", audits[0].ExtraInfo)
 
 	audits, err = ss.Audit().Get("missing", 0, 100)
-
+	require.Nil(t, err)
 	assert.Len(t, audits, 0)
 
 	audits, err = ss.Audit().Get("", 0, 100)
-
+	require.Nil(t, err)
 	if len(audits) < 4 {
 		t.Fatal("Failed to save and retrieve 4 audit logs")
 	}
@@ -65,12 +65,14 @@ func testAuditStorePermanentDeleteBatch(t *testing.T, ss store.Store) {
 	require.Nil(t, ss.Audit().Save(a3))
 
 	audits, err := ss.Audit().Get(a1.UserId, 0, 100)
+	require.Nil(t, err)
 	assert.Len(t, audits, 3)
 
 	_, err = ss.Audit().PermanentDeleteBatch(cutoff, 1000000)
 	require.Nil(t, err)
 
 	audits, err = ss.Audit().Get(a1.UserId, 0, 100)
+	require.Nil(t, err)
 	assert.Len(t, audits, 1)
 
 	require.Nil(t, ss.Audit().PermanentDeleteByUser(a1.UserId))
diff --git a/store/storetest/channel_store.go b/store/storetest/channel_store.go
index e45a34ea06..6bf9f09436 100644
--- a/store/storetest/channel_store.go
+++ b/store/storetest/channel_store.go
@@ -3349,6 +3349,7 @@ func testChannelStoreGetPinnedPosts(t *testing.T, ss store.Store) {
 		Message:   "test",
 		IsPinned:  true,
 	})
+	require.Nil(t, err)
 
 	if pl, errGet := ss.Channel().GetPinnedPosts(o1.Id); errGet != nil {
 		t.Fatal(errGet)
diff --git a/store/storetest/group_store.go b/store/storetest/group_store.go
index cf26186816..89ad1c7e7b 100644
--- a/store/storetest/group_store.go
+++ b/store/storetest/group_store.go
@@ -1761,6 +1761,7 @@ func testGetGroupsByChannel(t *testing.T, ss store.Store) {
 			if tc.TotalCount != nil {
 				var count int64
 				count, err = ss.Group().CountGroupsByChannel(tc.ChannelId, tc.Opts)
+				require.Nil(t, err)
 				require.Equal(t, *tc.TotalCount, count)
 			}
 		})
@@ -1975,6 +1976,7 @@ func testGetGroupsByTeam(t *testing.T, ss store.Store) {
 			if tc.TotalCount != nil {
 				var count int64
 				count, err = ss.Group().CountGroupsByTeam(tc.TeamId, tc.Opts)
+				require.Nil(t, err)
 				require.Equal(t, *tc.TotalCount, count)
 			}
 		})
diff --git a/store/storetest/post_store.go b/store/storetest/post_store.go
index e7379941c8..ad18de2f53 100644
--- a/store/storetest/post_store.go
+++ b/store/storetest/post_store.go
@@ -1735,6 +1735,7 @@ func testPostCountsByDay(t *testing.T, ss store.Store) {
 		UserId:      model.NewId(),
 	}
 	_, err = ss.Bot().Save(bot1)
+	require.Nil(t, err)
 
 	b1 := &model.Post{}
 	b1.Message = "bot message one"
@@ -2118,6 +2119,7 @@ func testPostStoreGetFlaggedPostsForChannel(t *testing.T, ss store.Store) {
 	o1.UserId = model.NewId()
 	o1.Message = "zz" + model.NewId() + "b"
 	o1, err := ss.Post().Save(o1)
+	require.Nil(t, err)
 	time.Sleep(2 * time.Millisecond)
 
 	o2 := &model.Post{}
@@ -2135,6 +2137,7 @@ func testPostStoreGetFlaggedPostsForChannel(t *testing.T, ss store.Store) {
 	o3.Message = "zz" + model.NewId() + "b"
 	o3.DeleteAt = 1
 	o3, err = ss.Post().Save(o3)
+	require.Nil(t, err)
 	time.Sleep(2 * time.Millisecond)
 
 	o4 := &model.Post{}
@@ -2280,6 +2283,7 @@ func testPostStoreOverwrite(t *testing.T, ss store.Store) {
 	o3.UserId = model.NewId()
 	o3.Message = "zz" + model.NewId() + "QQQQQQQQQQ"
 	o3, err = ss.Post().Save(o3)
+	require.Nil(t, err)
 
 	r1, err := ss.Post().Get(o1.Id, false)
 	if err != nil {
@@ -2489,6 +2493,7 @@ func testPostStoreGetPostsBatchForIndexing(t *testing.T, ss store.Store) {
 	o3.RootId = o1.Id
 	o3.Message = "zz" + model.NewId() + "QQQQQQQQQQ"
 	o3, err = ss.Post().Save(o3)
+	require.Nil(t, err)
 
 	if r, err := ss.Post().GetPostsBatchForIndexing(o1.CreateAt, model.GetMillis()+100000, 100); err != nil {
 		t.Fatal(err)
diff --git a/store/storetest/team_store.go b/store/storetest/team_store.go
index 8d161cbb66..7e028ebf3a 100644
--- a/store/storetest/team_store.go
+++ b/store/storetest/team_store.go
@@ -745,7 +745,7 @@ func testGetAllPublicTeamPageListing(t *testing.T, ss store.Store) {
 	assert.Nil(t, err)
 	assert.Equal(t, []*model.Team{t1, t3, t5}, teams)
 
-	teams, err = ss.Team().GetAllPublicTeamPageListing(1, 1)
+	_, err = ss.Team().GetAllPublicTeamPageListing(1, 1)
 	assert.Nil(t, err)
 }
 
diff --git a/store/storetest/user_store.go b/store/storetest/user_store.go
index b538248e67..31494cf3d2 100644
--- a/store/storetest/user_store.go
+++ b/store/storetest/user_store.go
@@ -3489,18 +3489,22 @@ func testUserStoreAnalyticsActiveCount(t *testing.T, ss store.Store, s SqlSuppli
 
 	// Daily counts (without bots)
 	count, err := ss.User().AnalyticsActiveCount(DAY_MILLISECONDS, model.UserCountOptions{IncludeBotAccounts: false})
+	require.Nil(t, err)
 	assert.Equal(t, int64(2), count)
 
 	// Daily counts (with bots)
 	count, err = ss.User().AnalyticsActiveCount(DAY_MILLISECONDS, model.UserCountOptions{IncludeBotAccounts: true})
+	require.Nil(t, err)
 	assert.Equal(t, int64(3), count)
 
 	// Monthly counts (without bots)
 	count, err = ss.User().AnalyticsActiveCount(MONTH_MILLISECONDS, model.UserCountOptions{IncludeBotAccounts: false})
+	require.Nil(t, err)
 	assert.Equal(t, int64(3), count)
 
 	// Monthly counts - (with bots)
 	count, err = ss.User().AnalyticsActiveCount(MONTH_MILLISECONDS, model.UserCountOptions{IncludeBotAccounts: true})
+	require.Nil(t, err)
 	assert.Equal(t, int64(4), count)
 }
 
@@ -4878,6 +4882,7 @@ func testUserStoreResetLastPictureUpdate(t *testing.T, ss store.Store) {
 	u1 := &model.User{}
 	u1.Email = MakeEmail()
 	_, err := ss.User().Save(u1)
+	require.Nil(t, err)
 	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	_, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1)
 	require.Nil(t, err)