diff --git a/staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_discovery_test.go b/staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_discovery_test.go
index 9bd48972404..c07993779d7 100644
--- a/staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_discovery_test.go
+++ b/staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_discovery_test.go
@@ -18,6 +18,7 @@ package apiserver
 
 import (
        "context"
        "net/http"
        "net/http/httptest"
        "strconv"
@@ -44,12 +45,14 @@ func newDiscoveryManager(rm discoveryendpoint.ResourceManager) *discoveryManager
        return NewDiscoveryManager(rm).(*discoveryManager)
 }
 
-// Returns true if the queue of services to sync empty this means everything has
-// been reconciled and placed into merged document
-func waitForEmptyQueue(stopCh <-chan struct{}, dm *discoveryManager) bool {
+// Returns true when it reachs the number of the cached services
+func waitForCacheNumber(stopCh <-chan struct{}, n int, dm *discoveryManager) bool {
        return cache.WaitForCacheSync(stopCh, func() bool {
                // Once items have successfully synced they are removed from queue.
-               return dm.dirtyAPIServiceQueue.Len() == 0
+               dm.resultsLock.Lock()
+               defer dm.resultsLock.Unlock()
+               return len(dm.cachedResults) == n
        })
 }
 
@@ -63,7 +66,6 @@ func TestBasic(t *testing.T) {
        service2.SetGroups(apiGroup2.Items)
        aggregatedResourceManager := discoveryendpoint.NewResourceManager()
        aggregatedManager := newDiscoveryManager(aggregatedResourceManager)
-
        for _, g := range apiGroup1.Items {
                for _, v := range g.Versions {
                        aggregatedManager.AddAPIService(&apiregistrationv1.APIService{
@@ -103,7 +105,7 @@ func TestBasic(t *testing.T) {
 
        go aggregatedManager.Run(testCtx.Done())
 
-       require.True(t, waitForEmptyQueue(testCtx.Done(), aggregatedManager))
+       require.True(t, waitForCacheNumber(testCtx.Done(), 2, aggregatedManager))
 
        response, _, parsed := fetchPath(aggregatedResourceManager, "")
        if response.StatusCode != 200 {
@@ -159,7 +161,9 @@ func TestDirty(t *testing.T) {
        defer cancel()
 
        go aggregatedManager.Run(testCtx.Done())
-       require.True(t, waitForEmptyQueue(testCtx.Done(), aggregatedManager))
+       require.True(t, waitForCacheNumber(testCtx.Done(), 1, aggregatedManager))
+       // time.Sleep(1 * time.Second)
+       fmt.Println("POST", aggregatedManager.apiServices, aggregatedManager.cachedResults)
 
        // immediately check for ping, since Run() should block for local services
        if !pinged.Load() {
@@ -211,7 +215,7 @@ func TestRemoveAPIService(t *testing.T) {
                aggregatedManager.RemoveAPIService(s.Name)
        }
 
-       require.True(t, waitForEmptyQueue(testCtx.Done(), aggregatedManager))
+       require.True(t, waitForCacheNumber(testCtx.Done(), 0, aggregatedManager))
 
        response, _, parsed := fetchPath(aggyService, "")
        if response.StatusCode != 200 {
@@ -293,7 +297,7 @@ func TestLegacyFallback(t *testing.T) {
        defer cancel()
 
        go aggregatedManager.Run(testCtx.Done())
-       require.True(t, waitForEmptyQueue(testCtx.Done(), aggregatedManager))
+       require.True(t, waitForCacheNumber(testCtx.Done(), 1, aggregatedManager))
 
        // At this point external services have synced. Check if discovery document
        // includes the legacy resources
@@ -362,7 +366,7 @@ func TestNotModified(t *testing.T) {
 
        // Important to wait here to ensure we prime the cache with the initial list
        // of documents in order to exercise 304 Not Modified
-       require.True(t, waitForEmptyQueue(testCtx.Done(), aggregatedManager))
+       require.True(t, waitForCacheNumber(testCtx.Done(), 1, aggregatedManager))
 
        // Now add all groups. We excluded one group before so that AllServicesSynced
        // could include it in this round. Now, if AllServicesSynced ever returns
@@ -373,7 +377,7 @@ func TestNotModified(t *testing.T) {
        }
 
        // This would wait the full timeout on 1.26.0.
-       require.True(t, waitForEmptyQueue(testCtx.Done(), aggregatedManager))
+       require.True(t, waitForCacheNumber(testCtx.Done(), 1, aggregatedManager))
 }