diff --git a/app/job_test.go b/app/job_test.go
index 6a3b0f6357..d45a45a6e8 100644
--- a/app/job_test.go
+++ b/app/job_test.go
@@ -23,11 +23,9 @@ func TestGetJob(t *testing.T) {
 
 	defer th.App.Srv.Store.Job().Delete(status.Id)
 
-	if received, err := th.App.GetJob(status.Id); err != nil {
-		t.Fatal(err)
-	} else if received.Id != status.Id || received.Status != status.Status {
-		t.Fatal("inccorrect job status received")
-	}
+	received, err := th.App.GetJob(status.Id)
+	require.Nil(t, err)
+	require.Equal(t, status, received, "incorrect job status received")
 }
 
 func TestGetJobByType(t *testing.T) {
@@ -60,21 +58,14 @@ func TestGetJobByType(t *testing.T) {
 		defer th.App.Srv.Store.Job().Delete(status.Id)
 	}
 
-	if received, err := th.App.GetJobsByType(jobType, 0, 2); err != nil {
-		t.Fatal(err)
-	} else if len(received) != 2 {
-		t.Fatal("received wrong number of statuses")
-	} else if received[0].Id != statuses[2].Id {
-		t.Fatal("should've received newest job first")
-	} else if received[1].Id != statuses[0].Id {
-		t.Fatal("should've received second newest job second")
-	}
+	received, err := th.App.GetJobsByType(jobType, 0, 2)
+	require.Nil(t, err)
+	require.Len(t, received, 2, "received wrong number of statuses")
+	require.Equal(t, statuses[2], received[0], "should've received newest job first")
+	require.Equal(t, statuses[0], received[1], "should've received second newest job second")
 
-	if received, err := th.App.GetJobsByType(jobType, 2, 2); err != nil {
-		t.Fatal(err)
-	} else if len(received) != 1 {
-		t.Fatal("received wrong number of statuses")
-	} else if received[0].Id != statuses[1].Id {
-		t.Fatal("should've received oldest job last")
-	}
+	received, err = th.App.GetJobsByType(jobType, 2, 2)
+	require.Nil(t, err)
+	require.Len(t, received, 1, "received wrong number of statuses")
+	require.Equal(t, statuses[1], received[0], "should've received oldest job last")
 }