diff --git a/test/integration/quota_test.go b/test/integration/quota_test.go
index 9d4053f5e02..96d288ac709 100644
--- a/test/integration/quota_test.go
+++ b/test/integration/quota_test.go
@@ -52,9 +52,11 @@ import (
 func TestQuota(t *testing.T) {
 	framework.DeleteAllEtcdKeys()
 
+	initializationCh := make(chan struct{})
 	// Set up a master
 	var m *master.Master
 	s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		<-initializationCh
 		m.Handler.ServeHTTP(w, req)
 	}))
 	// TODO: Uncomment when fix #19254
@@ -71,6 +73,7 @@ func TestQuota(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Error in bringing up the master: %v", err)
 	}
+	close(initializationCh)
 
 	go replicationcontroller.NewReplicationManagerFromClient(clientset, controller.NoResyncPeriodFunc, replicationcontroller.BurstReplicas, 4096).
 		Run(3, wait.NeverStop)