diff --git a/pkg/compose/watch_test.go b/pkg/compose/watch_test.go
index d359a19fb9..e123ecd217 100644
--- a/pkg/compose/watch_test.go
+++ b/pkg/compose/watch_test.go
@@ -147,7 +147,8 @@ func TestWatch_Sync(t *testing.T) {
 
 	watcher.Events() <- watch.NewFileEvent("/sync/changed")
 	watcher.Events() <- watch.NewFileEvent("/sync/changed/sub")
-	clock.BlockUntil(3)
+	err := clock.BlockUntilContext(ctx, 3)
+	assert.NilError(t, err)
 	clock.Advance(watch.QuietPeriod)
 	select {
 	case actual := <-syncer.synced:
@@ -161,7 +162,8 @@ func TestWatch_Sync(t *testing.T) {
 
 	watcher.Events() <- watch.NewFileEvent("/rebuild")
 	watcher.Events() <- watch.NewFileEvent("/sync/changed")
-	clock.BlockUntil(4)
+	err = clock.BlockUntilContext(ctx, 4)
+	assert.NilError(t, err)
 	clock.Advance(watch.QuietPeriod)
 	select {
 	case batch := <-syncer.synced:
diff --git a/pkg/watch/debounce_test.go b/pkg/watch/debounce_test.go
index 9571fd5468..fd1c40bbf2 100644
--- a/pkg/watch/debounce_test.go
+++ b/pkg/watch/debounce_test.go
@@ -40,7 +40,8 @@ func Test_BatchDebounceEvents(t *testing.T) {
 		ch <- FileEvent(path)
 	}
 	// we sent 100 events + the debouncer
-	clock.BlockUntil(101)
+	err := clock.BlockUntilContext(ctx, 101)
+	assert.NilError(t, err)
 	clock.Advance(QuietPeriod)
 	select {
 	case batch := <-eventBatchCh:
@@ -51,7 +52,8 @@ func Test_BatchDebounceEvents(t *testing.T) {
 	case <-time.After(50 * time.Millisecond):
 		t.Fatal("timed out waiting for events")
 	}
-	clock.BlockUntil(1)
+	err = clock.BlockUntilContext(ctx, 1)
+	assert.NilError(t, err)
 	clock.Advance(QuietPeriod)
 
 	// there should only be a single batch