diff --git a/internal/server/api_sources_test.go b/internal/server/api_sources_test.go
index f9c124982..298bf666d 100644
--- a/internal/server/api_sources_test.go
+++ b/internal/server/api_sources_test.go
@@ -68,11 +68,17 @@ func TestSnapshotCounters(t *testing.T) {
 	require.NoError(t, err)
 
 	// wait until new task for the upload is created
-	deadline := clock.Now().Add(10 * time.Second)
-	for mustGetLatestTask(t, cli).TaskID == et.TaskID && clock.Now().Before(deadline) {
+	deadline := clock.Now().Add(30 * time.Second)
+
+	latest := mustGetLatestTask(t, cli)
+	for latest.TaskID == et.TaskID && clock.Now().Before(deadline) {
 		time.Sleep(100 * time.Microsecond)
+
+		latest = mustGetLatestTask(t, cli)
 	}
 
+	require.NotEqual(t, latest.TaskID, et.TaskID)
+
 	ut := waitForTask(t, cli, mustGetLatestTask(t, cli).TaskID, 15*time.Second)
 
 	t.Logf("got latest task: %v", ut)