diff --git a/server/store/datastore/task_test.go b/server/store/datastore/task_test.go
index 38bd4c84aa..0a3e5d1a46 100644
--- a/server/store/datastore/task_test.go
+++ b/server/store/datastore/task_test.go
@@ -15,7 +15,6 @@
 package datastore
 
 import (
-	"reflect"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -39,19 +38,10 @@ func TestTaskList(t *testing.T) {
 		t.Error(err)
 		return
 	}
-	if got, want := len(list), 1; got != want {
-		t.Errorf("Want %d task, got %d", want, got)
-		return
-	}
-	if got, want := list[0].ID, "some_random_id"; got != want {
-		t.Errorf("Want task id %s, got %s", want, got)
-	}
-	if got, want := list[0].Data, "foo"; string(got) != want {
-		t.Errorf("Want task data %s, got %s", want, string(got))
-	}
-	if got, want := list[0].DepStatus, map[string]string{"test": "dep"}; !reflect.DeepEqual(got, want) {
-		t.Errorf("Want task data %s, got %s", want, got)
-	}
+	assert.Len(t, list, 1, "Expected one task in list")
+	assert.EqualValues(t, "some_random_id", list[0].ID)
+	assert.EqualValues(t, "foo", list[0].Data)
+	assert.EqualValues(t, map[string]string{"test": "dep"}, list[0].DepStatus)
 
 	err = store.TaskDelete("some_random_id")
 	if err != nil {
@@ -64,7 +54,5 @@ func TestTaskList(t *testing.T) {
 		t.Error(err)
 		return
 	}
-	if got, want := len(list), 0; got != want {
-		t.Errorf("Want empty task list after delete")
-	}
+	assert.Len(t, list, 0, "Want empty task list after delete")
 }