diff --git a/federation/pkg/federation-controller/deployment/BUILD b/federation/pkg/federation-controller/deployment/BUILD
index 99a2cd66693..ec6684394c6 100644
--- a/federation/pkg/federation-controller/deployment/BUILD
+++ b/federation/pkg/federation-controller/deployment/BUILD
@@ -56,6 +56,8 @@ go_test(
         "//pkg/client/clientset_generated/release_1_5:go_default_library",
         "//pkg/client/clientset_generated/release_1_5/fake:go_default_library",
         "//pkg/runtime:go_default_library",
+        "//pkg/types:go_default_library",
+        "//pkg/util/wait:go_default_library",
         "//vendor:github.com/stretchr/testify/assert",
     ],
 )
diff --git a/federation/pkg/federation-controller/deployment/deploymentcontroller_test.go b/federation/pkg/federation-controller/deployment/deploymentcontroller_test.go
index e035655bb43..c243ce06c57 100644
--- a/federation/pkg/federation-controller/deployment/deploymentcontroller_test.go
+++ b/federation/pkg/federation-controller/deployment/deploymentcontroller_test.go
@@ -31,6 +31,8 @@ import (
 	kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
 	fake_kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake"
 	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/types"
+	"k8s.io/kubernetes/pkg/util/wait"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -135,6 +137,10 @@ func TestDeploymentController(t *testing.T) {
 		}
 	}
 	assert.NoError(t, CheckObjectFromChan(cluster1CreateChan, checkDeployment(dep1, *dep1.Spec.Replicas)))
+	err := WaitForStoreUpdate(
+		deploymentController.fedDeploymentInformer.GetTargetStore(),
+		cluster1.Name, types.NamespacedName{Namespace: dep1.Namespace, Name: dep1.Name}.String(), wait.ForeverTestTimeout)
+	assert.Nil(t, err, "deployment should have appeared in the informer store")
 
 	// Increase replica count. Expect to see the update in cluster1.
 	newRep := int32(8)