diff --git a/agent/testagent.go b/agent/testagent.go
index 5649d3378d..b01d4e5d5e 100644
--- a/agent/testagent.go
+++ b/agent/testagent.go
@@ -288,7 +288,11 @@ func (a *TestAgent) Shutdown() error {
 
 	// shutdown agent before endpoints
 	defer a.Agent.ShutdownEndpoints()
-	return a.Agent.ShutdownAgent()
+	if err := a.Agent.ShutdownAgent(); err != nil {
+		return err
+	}
+	<-a.Agent.ShutdownCh()
+	return nil
 }
 
 func (a *TestAgent) DNSAddr() string {