diff --git a/store/storetest/license_store.go b/store/storetest/license_store.go
index ab9722dd9b..b30c751665 100644
--- a/store/storetest/license_store.go
+++ b/store/storetest/license_store.go
@@ -21,19 +21,16 @@ func testLicenseStoreSave(t *testing.T, ss store.Store) {
 	l1.Id = model.NewId()
 	l1.Bytes = "junk"
 
-	if _, err := ss.License().Save(&l1); err != nil {
-		t.Fatal("couldn't save license record", err)
-	}
+	_, err := ss.License().Save(&l1)
+	require.Nil(t, err, "couldn't save license record")
 
-	if _, err := ss.License().Save(&l1); err != nil {
-		t.Fatal("shouldn't fail on trying to save existing license record", err)
-	}
+	_, err = ss.License().Save(&l1)
+	require.Nil(t, err, "shouldn't fail on trying to save existing license record")
 
 	l1.Id = ""
 
-	if _, err := ss.License().Save(&l1); err == nil {
-		t.Fatal("should fail on invalid license", err)
-	}
+	_, err = ss.License().Save(&l1)
+	require.NotNil(t, err, "should fail on invalid license")
 }
 
 func testLicenseStoreGet(t *testing.T, ss store.Store) {
@@ -44,15 +41,11 @@ func testLicenseStoreGet(t *testing.T, ss store.Store) {
 	_, err := ss.License().Save(&l1)
 	require.Nil(t, err)
 
-	if record, err := ss.License().Get(l1.Id); err != nil {
-		t.Fatal("couldn't get license", err)
-	} else {
-		if record.Bytes != l1.Bytes {
-			t.Fatal("license bytes didn't match")
-		}
-	}
+	record, err := ss.License().Get(l1.Id)
+	require.Nil(t, err, "couldn't get license")
 
-	if _, err := ss.License().Get("missing"); err == nil {
-		t.Fatal("should fail on get license", err)
-	}
+	require.Equal(t, record.Bytes, l1.Bytes, "license bytes didn't match")
+
+	_, err = ss.License().Get("missing")
+	require.NotNil(t, err, "should fail on get license")
 }