diff --git a/web/webhook_test.go b/web/webhook_test.go
index f887e0818b..dcf96ef0c4 100644
--- a/web/webhook_test.go
+++ b/web/webhook_test.go
@@ -250,9 +250,7 @@ func TestCommandWebhooks(t *testing.T) {
 	}
 
 	hook, appErr := th.App.CreateCommandWebhook(cmd.Id, args)
-	if appErr != nil {
-		t.Fatal(appErr)
-	}
+	require.Nil(t, appErr)
 
 	resp, err := http.Post(ApiClient.Url+"/hooks/commands/123123123123", "application/json", bytes.NewBufferString(`{"text":"this is a test"}`))
 	require.NoError(t, err)
@@ -263,12 +261,11 @@ func TestCommandWebhooks(t *testing.T) {
 	assert.Equal(t, http.StatusBadRequest, resp.StatusCode)
 
 	for i := 0; i < 5; i++ {
-		if resp, appErr := http.Post(ApiClient.Url+"/hooks/commands/"+hook.Id, "application/json", bytes.NewBufferString(`{"text":"this is a test"}`)); err != nil || resp.StatusCode != http.StatusOK {
-			t.Fatal(appErr)
-		}
+		response, appErr2 := http.Post(ApiClient.Url+"/hooks/commands/"+hook.Id, "application/json", bytes.NewBufferString(`{"text":"this is a test"}`))
+		require.Nil(t, appErr2)
+		require.Equal(t, http.StatusOK, response.StatusCode)
 	}
 
-	if resp, _ := http.Post(ApiClient.Url+"/hooks/commands/"+hook.Id, "application/json", bytes.NewBufferString(`{"text":"this is a test"}`)); resp.StatusCode != http.StatusBadRequest {
-		t.Fatal("expected error for sixth usage")
-	}
+	resp, _ = http.Post(ApiClient.Url+"/hooks/commands/"+hook.Id, "application/json", bytes.NewBufferString(`{"text":"this is a test"}`))
+	require.Equal(t, http.StatusBadRequest, resp.StatusCode)
 }