diff --git a/model/terms_of_service_test.go b/model/terms_of_service_test.go
index b9f19d0c16..c52dfb28ea 100644
--- a/model/terms_of_service_test.go
+++ b/model/terms_of_service_test.go
@@ -13,39 +13,25 @@ import (
 func TestTermsOfServiceIsValid(t *testing.T) {
 	s := TermsOfService{}
 
-	if err := s.IsValid(); err == nil {
-		t.Fatal("should be invalid")
-	}
+	assert.Error(t, s.IsValid(), "should be invalid")
 
 	s.Id = NewId()
-	if err := s.IsValid(); err == nil {
-		t.Fatal("should be invalid")
-	}
+	assert.Error(t, s.IsValid(), "should be invalid")
 
 	s.CreateAt = GetMillis()
-	if err := s.IsValid(); err == nil {
-		t.Fatal("should be invalid")
-	}
+	assert.Error(t, s.IsValid(), "should be invalid")
 
 	s.UserId = NewId()
-	if err := s.IsValid(); err != nil {
-		t.Fatal("should be invalid")
-	}
+	assert.Error(t, s.IsValid(), "should be invalid")
 
 	s.Text = strings.Repeat("0", POST_MESSAGE_MAX_RUNES_V2+1)
-	if err := s.IsValid(); err == nil {
-		t.Fatal("should be invalid")
-	}
+	assert.Error(t, s.IsValid(), "should be invalid")
 
 	s.Text = strings.Repeat("0", POST_MESSAGE_MAX_RUNES_V2)
-	if err := s.IsValid(); err != nil {
-		t.Fatal(err)
-	}
+	assert.Nil(t, s.IsValid(), "should be valid")
 
 	s.Text = "test"
-	if err := s.IsValid(); err != nil {
-		t.Fatal(err)
-	}
+	assert.Nil(t, s.IsValid(), "should be valid")
 }
 
 func TestTermsOfServiceJson(t *testing.T) {