diff --git a/internal/config/cache_max_bytes_internal_test.go b/internal/config/cache_max_bytes_internal_test.go
index fe9c9a8..ae55913 100644
--- a/internal/config/cache_max_bytes_internal_test.go
+++ b/internal/config/cache_max_bytes_internal_test.go
@@ -244,7 +244,8 @@ func TestResolveCacheMaxBytesComputesDefaultWhenOmitted(t *testing.T) {
 		return 4294967296, nil
 	}
 
-	if err := c.resolveCacheMaxBytes(discardLogger(), probe); err != nil {
+	err = c.resolveCacheMaxBytes(discardLogger(), probe)
+	if err != nil {
 		t.Fatalf("resolveCacheMaxBytes returned error: %v", err)
 	}
 
@@ -286,7 +287,8 @@ func TestResolveCacheMaxBytesDoesNotOverrideExplicitValue(t *testing.T) {
 		return 0, errors.New("probe must not be called")
 	}
 
-	if err := c.resolveCacheMaxBytes(discardLogger(), probe); err != nil {
+	err = c.resolveCacheMaxBytes(discardLogger(), probe)
+	if err != nil {
 		t.Fatalf("resolveCacheMaxBytes returned error: %v", err)
 	}
 
diff --git a/internal/imgcache/eviction_internal_test.go b/internal/imgcache/eviction_internal_test.go
index dd52741..56434b3 100644
--- a/internal/imgcache/eviction_internal_test.go
+++ b/internal/imgcache/eviction_internal_test.go
@@ -37,7 +37,8 @@ func evictionTestDB(t *testing.T) *sql.DB {
 
 	db.SetMaxOpenConns(1)
 
-	if err := database.ApplyMigrations(context.Background(), db, nil); err != nil {
+	err = database.ApplyMigrations(context.Background(), db, nil)
+	if err != nil {
 		t.Fatalf("failed to apply migrations: %v", err)
 	}
 
@@ -345,7 +346,8 @@ func TestEvictToLimitEvictsLeastRecentlyUsedFirst(t *testing.T) {
 		setVariantLastAccessed(t, cache, key, now.Add(-ages[i]))
 	}
 
-	if err := cache.EvictToLimit(context.Background()); err != nil {
+	err := cache.EvictToLimit(context.Background())
+	if err != nil {
 		t.Fatalf("EvictToLimit failed: %v", err)
 	}
 
@@ -405,7 +407,8 @@ func TestEvictionRemovesMultiReferencedBlobTogetherWithAllReferences(t *testing.
 	setSourceLastAccessed(t, cache, sharedHash, now.Add(-2*time.Hour))
 	setSourceLastAccessed(t, cache, recentHash, now.Add(-time.Minute))
 
-	if err := cache.EvictToLimit(context.Background()); err != nil {
+	err := cache.EvictToLimit(context.Background())
+	if err != nil {
 		t.Fatalf("EvictToLimit failed: %v", err)
 	}
 
@@ -477,7 +480,8 @@ func TestEvictionKeepsEverythingWhenUnderLimit(t *testing.T) {
 	storeEvictionTestVariant(t, cache, testVariantKeyOne,
 		bytes.Repeat([]byte{0xE0}, 500))
 
-	if err := cache.EvictToLimit(context.Background()); err != nil {
+	err := cache.EvictToLimit(context.Background())
+	if err != nil {
 		t.Fatalf("EvictToLimit failed: %v", err)
 	}
 
@@ -904,11 +908,13 @@ func TestEvictSourceBlobExcludesConcurrentStoreOfIdenticalContent(t *testing.T)
 
 	close(proceed)
 
-	if err := <-evictDone; err != nil {
+	err := <-evictDone
+	if err != nil {
 		t.Fatalf("evictSourceBlob failed: %v", err)
 	}
 
-	if err := <-storeDone; err != nil {
+	err = <-storeDone
+	if err != nil {
 		t.Fatalf("StoreSource failed: %v", err)
 	}