diff --git a/assertions/manager_test.go b/assertions/manager_test.go
index 78bb76d61..f65f64691 100644
--- a/assertions/manager_test.go
+++ b/assertions/manager_test.go
@@ -540,7 +540,7 @@ func TestFastConfirmationWithSafe(t *testing.T) {
 	assertionManagerBob.Start(ctx)
 
 	// Only after both Alice and Bob confirm the assertion, it should be confirmed.
-	ctx, cancel := context.WithTimeout(ctx, time.Second)
+	ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
 	defer cancel()
 	expectAssertionConfirmed(t, ctx, setup.Backend, aliceChain.RollupAddress())
 }
diff --git a/state-commitments/optimized/history_commitment_test.go b/state-commitments/optimized/history_commitment_test.go
index 61288d087..2f4dd743b 100644
--- a/state-commitments/optimized/history_commitment_test.go
+++ b/state-commitments/optimized/history_commitment_test.go
@@ -32,7 +32,8 @@ func FuzzHistoryCommitter(f *testing.F) {
 			hashedLeaves[i] = crypto.Keccak256Hash(simpleHash[:])
 		}
 		committer := NewCommitter()
-		committer.ComputeRoot(hashedLeaves, virtual)
+		_, err := committer.ComputeRoot(hashedLeaves, virtual)
+		_ = err
 	})
 }
 
@@ -444,7 +445,8 @@ func BenchmarkMaximumDepthHistoryCommitment(b *testing.B) {
 	committer := NewCommitter()
 	b.StartTimer()
 	for i := 0; i < b.N; i++ {
-		committer.ComputeRoot(hashedLeaves, 1<<26)
+		_, err := committer.ComputeRoot(hashedLeaves, 1<<26)
+		_ = err
 	}
 }