diff --git a/pkg/diunwebhook/diunwebhook_test.go b/pkg/diunwebhook/diunwebhook_test.go
index 3271830..ca2dc4b 100644
--- a/pkg/diunwebhook/diunwebhook_test.go
+++ b/pkg/diunwebhook/diunwebhook_test.go
@@ -34,9 +34,8 @@ func TestUpdateEventAndGetUpdates(t *testing.T) {
 		Created:     time.Now(),
 		Platform:    "linux/amd64",
 	}
-	err := diun.UpdateEvent(event)
-	if err != nil {
-		return
+	if err := diun.UpdateEvent(event); err != nil {
+		t.Fatalf("test setup: UpdateEvent failed: %v", err)
 	}
 	got, err := diun.GetUpdates()
 	if err != nil {
@@ -149,9 +148,8 @@ func TestWebhookHandler_BadRequest(t *testing.T) {
 func TestUpdatesHandler(t *testing.T) {
 	diun.UpdatesReset()
 	event := diun.DiunEvent{Image: "busybox:latest"}
-	err := diun.UpdateEvent(event)
-	if err != nil {
-		return
+	if err := diun.UpdateEvent(event); err != nil {
+		t.Fatalf("test setup: UpdateEvent failed: %v", err)
 	}
 	req := httptest.NewRequest(http.MethodGet, "/api/updates", nil)
 	rec := httptest.NewRecorder()
@@ -225,9 +223,8 @@ func TestConcurrentUpdateEvent(t *testing.T) {
 	for i := range n {
 		go func(i int) {
 			defer wg.Done()
-			err := diun.UpdateEvent(diun.DiunEvent{Image: fmt.Sprintf("image:%d", i)})
-			if err != nil {
-				return
+			if err := diun.UpdateEvent(diun.DiunEvent{Image: fmt.Sprintf("image:%d", i)}); err != nil {
+				t.Fatalf("test setup: UpdateEvent[%d] failed: %v", i, err)
 			}
 		}(i)
 	}
@@ -283,9 +280,8 @@ func TestMainHandlerIntegration(t *testing.T) {
 
 func TestDismissHandler_Success(t *testing.T) {
 	diun.UpdatesReset()
-	err := diun.UpdateEvent(diun.DiunEvent{Image: "nginx:latest"})
-	if err != nil {
-		return
+	if err := diun.UpdateEvent(diun.DiunEvent{Image: "nginx:latest"}); err != nil {
+		t.Fatalf("test setup: UpdateEvent failed: %v", err)
 	}
 
 	req := httptest.NewRequest(http.MethodPatch, "/api/updates/nginx:latest", nil)
@@ -325,9 +321,8 @@ func TestDismissHandler_EmptyImage(t *testing.T) {
 
 func TestDismissHandler_SlashInImageName(t *testing.T) {
 	diun.UpdatesReset()
-	err := diun.UpdateEvent(diun.DiunEvent{Image: "ghcr.io/user/image:tag"})
-	if err != nil {
-		return
+	if err := diun.UpdateEvent(diun.DiunEvent{Image: "ghcr.io/user/image:tag"}); err != nil {
+		t.Fatalf("test setup: UpdateEvent failed: %v", err)
 	}
 
 	req := httptest.NewRequest(http.MethodPatch, "/api/updates/ghcr.io/user/image:tag", nil)
@@ -347,7 +342,9 @@ func TestDismissHandler_SlashInImageName(t *testing.T) {
 
 func TestDismissHandler_ReappearsAfterNewWebhook(t *testing.T) {
 	diun.UpdatesReset()
-	diun.UpdateEvent(diun.DiunEvent{Image: "nginx:latest"})
+	if err := diun.UpdateEvent(diun.DiunEvent{Image: "nginx:latest"}); err != nil {
+		t.Fatalf("test setup: UpdateEvent failed: %v", err)
+	}
 
 	req := httptest.NewRequest(http.MethodPatch, "/api/updates/nginx:latest", nil)
 	rec := httptest.NewRecorder()