diff --git a/model/user_access_token_test.go b/model/user_access_token_test.go
index 1b4a9ccfd6..04ac3e96a7 100644
--- a/model/user_access_token_test.go
+++ b/model/user_access_token_test.go
@@ -6,6 +6,8 @@ package model
 import (
 	"strings"
 	"testing"
+
+	"github.com/stretchr/testify/require"
 )
 
 func TestUserAccessTokenJson(t *testing.T) {
@@ -16,43 +18,33 @@ func TestUserAccessTokenJson(t *testing.T) {
 	json := a1.ToJson()
 	ra1 := UserAccessTokenFromJson(strings.NewReader(json))
 
-	if a1.Token != ra1.Token {
-		t.Fatal("tokens didn't match")
-	}
+	require.Equal(t, a1.Token, ra1.Token, "tokens didn't match")
 
 	tokens := []*UserAccessToken{&a1}
 	json = UserAccessTokenListToJson(tokens)
 	tokens = UserAccessTokenListFromJson(strings.NewReader(json))
 
-	if tokens[0].Token != a1.Token {
-		t.Fatal("tokens didn't match")
-	}
+	require.Equal(t, tokens[0].Token, ra1.Token, "tokens didn't match")
 }
 
 func TestUserAccessTokenIsValid(t *testing.T) {
 	ad := UserAccessToken{}
 
-	if err := ad.IsValid(); err == nil || err.Id != "model.user_access_token.is_valid.id.app_error" {
-		t.Fatal(err)
-	}
+	err := ad.IsValid()
+	require.False(t, err == nil || err.Id != "model.user_access_token.is_valid.id.app_error")
 
 	ad.Id = NewRandomString(26)
-	if err := ad.IsValid(); err == nil || err.Id != "model.user_access_token.is_valid.token.app_error" {
-		t.Fatal(err)
-	}
+	err = ad.IsValid()
+	require.False(t, err == nil || err.Id != "model.user_access_token.is_valid.token.app_error")
 
 	ad.Token = NewRandomString(26)
-	if err := ad.IsValid(); err == nil || err.Id != "model.user_access_token.is_valid.user_id.app_error" {
-		t.Fatal(err)
-	}
+	err = ad.IsValid()
+	require.False(t, err == nil || err.Id != "model.user_access_token.is_valid.user_id.app_error")
 
 	ad.UserId = NewRandomString(26)
-	if err := ad.IsValid(); err != nil {
-		t.Fatal(err)
-	}
+	require.Nil(t, ad.IsValid())
 
 	ad.Description = NewRandomString(256)
-	if err := ad.IsValid(); err == nil || err.Id != "model.user_access_token.is_valid.description.app_error" {
-		t.Fatal(err)
-	}
+	err = ad.IsValid()
+	require.False(t, err == nil || err.Id != "model.user_access_token.is_valid.description.app_error")
 }