diff --git a/internal/server/api_sources_test.go b/internal/server/api_sources_test.go
index 82081fe22..64022ec97 100644
--- a/internal/server/api_sources_test.go
+++ b/internal/server/api_sources_test.go
@@ -66,8 +66,22 @@ func TestSnapshotCounters(t *testing.T) {
 	require.True(t, uresp.Sources[si.String()].Success)
 	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) {
+		time.Sleep(100 * time.Microsecond)
+	}
+
 	ut := waitForTask(t, cli, mustGetLatestTask(t, cli).TaskID, 15*time.Second)
 
+	t.Logf("got latest task: %v", ut)
+
+	allTasks := mustListTasks(t, cli)
+
+	for tid, tsk := range allTasks {
+		t.Logf("allTasks[%v] =  %v", tid, tsk)
+	}
+
 	require.Equal(t, ut.Counters["Hashed Files"], uitask.SimpleCounter(3))
 	require.Equal(t, ut.Counters["Hashed Bytes"], uitask.BytesCounter(9))
 	require.Equal(t, ut.Counters["Excluded Directories"], uitask.SimpleCounter(1))