diff --git a/model/command_test.go b/model/command_test.go
index 53c15f74ad..0c8136b57c 100644
--- a/model/command_test.go
+++ b/model/command_test.go
@@ -6,6 +6,8 @@ package model
 import (
 	"strings"
 	"testing"
+
+	"github.com/stretchr/testify/require"
 )
 
 func TestCommandJson(t *testing.T) {
@@ -13,9 +15,7 @@ func TestCommandJson(t *testing.T) {
 	json := o.ToJson()
 	ro := CommandFromJson(strings.NewReader(json))
 
-	if o.Id != ro.Id {
-		t.Fatal("Ids do not match")
-	}
+	require.Equal(t, o.Id, ro.Id, "Ids do not match")
 }
 
 func TestCommandIsValid(t *testing.T) {
@@ -33,134 +33,82 @@ func TestCommandIsValid(t *testing.T) {
 		Description: "",
 	}
 
-	if err := o.IsValid(); err != nil {
-		t.Fatal(err)
-	}
+	require.Nil(t, o.IsValid())
 
 	o.Id = ""
-	if err := o.IsValid(); err == nil {
-		t.Fatal("should be invalid")
-	}
+	require.NotNil(t, o.IsValid(), "should be invalid")
 
 	o.Id = NewId()
-	if err := o.IsValid(); err != nil {
-		t.Fatal(err)
-	}
+	require.Nil(t, o.IsValid())
 
 	o.Token = ""
-	if err := o.IsValid(); err == nil {
-		t.Fatal("should be invalid")
-	}
+	require.NotNil(t, o.IsValid(), "should be invalid")
 
 	o.Token = NewId()
-	if err := o.IsValid(); err != nil {
-		t.Fatal(err)
-	}
+	require.Nil(t, o.IsValid())
 
 	o.CreateAt = 0
-	if err := o.IsValid(); err == nil {
-		t.Fatal("should be invalid")
-	}
+	require.NotNil(t, o.IsValid(), "should be invalid")
 
 	o.CreateAt = GetMillis()
-	if err := o.IsValid(); err != nil {
-		t.Fatal(err)
-	}
+	require.Nil(t, o.IsValid())
 
 	o.UpdateAt = 0
-	if err := o.IsValid(); err == nil {
-		t.Fatal("should be invalid")
-	}
+	require.NotNil(t, o.IsValid(), "should be invalid")
 
 	o.UpdateAt = GetMillis()
-	if err := o.IsValid(); err != nil {
-		t.Fatal(err)
-	}
+	require.Nil(t, o.IsValid())
 
 	o.CreatorId = ""
-	if err := o.IsValid(); err == nil {
-		t.Fatal("should be invalid")
-	}
+	require.NotNil(t, o.IsValid(), "should be invalid")
 
 	o.CreatorId = NewId()
-	if err := o.IsValid(); err != nil {
-		t.Fatal(err)
-	}
+	require.Nil(t, o.IsValid())
 
 	o.TeamId = ""
-	if err := o.IsValid(); err == nil {
-		t.Fatal("should be invalid")
-	}
+	require.NotNil(t, o.IsValid(), "should be invalid")
 
 	o.TeamId = NewId()
-	if err := o.IsValid(); err != nil {
-		t.Fatal(err)
-	}
+	require.Nil(t, o.IsValid())
 
 	o.Trigger = ""
-	if err := o.IsValid(); err == nil {
-		t.Fatal("should be invalid")
-	}
+	require.NotNil(t, o.IsValid(), "should be invalid")
 
 	o.Trigger = strings.Repeat("1", 129)
-	if err := o.IsValid(); err == nil {
-		t.Fatal("should be invalid")
-	}
+	require.NotNil(t, o.IsValid(), "should be invalid")
 
 	o.Trigger = strings.Repeat("1", 128)
-	if err := o.IsValid(); err != nil {
-		t.Fatal(err)
-	}
+	require.Nil(t, o.IsValid())
 
 	o.URL = ""
-	if err := o.IsValid(); err == nil {
-		t.Fatal("should be invalid")
-	}
+	require.NotNil(t, o.IsValid(), "should be invalid")
 
 	o.URL = "1234"
-	if err := o.IsValid(); err == nil {
-		t.Fatal("should be invalid")
-	}
+	require.NotNil(t, o.IsValid(), "should be invalid")
 
 	o.URL = "https://example.com"
-	if err := o.IsValid(); err != nil {
-		t.Fatal(err)
-	}
+	require.Nil(t, o.IsValid())
 
 	o.Method = "https://example.com"
-	if err := o.IsValid(); err == nil {
-		t.Fatal("should be invalid")
-	}
+	require.NotNil(t, o.IsValid(), "should be invalid")
 
 	o.Method = COMMAND_METHOD_GET
-	if err := o.IsValid(); err != nil {
-		t.Fatal(err)
-	}
+	require.Nil(t, o.IsValid())
 
 	o.Method = COMMAND_METHOD_POST
-	if err := o.IsValid(); err != nil {
-		t.Fatal(err)
-	}
+	require.Nil(t, o.IsValid())
 
 	o.DisplayName = strings.Repeat("1", 65)
-	if err := o.IsValid(); err == nil {
-		t.Fatal("should be invalid")
-	}
+	require.NotNil(t, o.IsValid(), "should be invalid")
 
 	o.DisplayName = strings.Repeat("1", 64)
-	if err := o.IsValid(); err != nil {
-		t.Fatal(err)
-	}
+	require.Nil(t, o.IsValid())
 
 	o.Description = strings.Repeat("1", 129)
-	if err := o.IsValid(); err == nil {
-		t.Fatal("should be invalid")
-	}
+	require.NotNil(t, o.IsValid(), "should be invalid")
 
 	o.Description = strings.Repeat("1", 128)
-	if err := o.IsValid(); err != nil {
-		t.Fatal(err)
-	}
+	require.Nil(t, o.IsValid())
 }
 
 func TestCommandPreSave(t *testing.T) {