diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go
index ac3967ad1ba..62661145779 100644
--- a/cmd/integration/integration.go
+++ b/cmd/integration/integration.go
@@ -28,6 +28,7 @@ import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/controller"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/registry"
 	"github.com/coreos/go-etcd/etcd"
 )
@@ -48,13 +49,12 @@ func main() {
 	}, "/api/v1beta1")
 	server := httptest.NewServer(apiserver)
 
-	controllerManager := registry.MakeReplicationManager(etcd.NewClient(servers),
+	controllerManager := controller.MakeReplicationManager(etcd.NewClient(servers),
 		client.Client{
 			Host: server.URL,
 		})
 
-	go controllerManager.Synchronize()
-	go controllerManager.WatchControllers()
+	controllerManager.Run(10 * time.Second)
 
 	// Ok. we're good to go.
 	log.Printf("API Server started on %s", server.URL)
diff --git a/cmd/localkube/localkube.go b/cmd/localkube/localkube.go
index 6bd25e9d81e..5f201162194 100644
--- a/cmd/localkube/localkube.go
+++ b/cmd/localkube/localkube.go
@@ -29,10 +29,9 @@ import (
 	"time"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/controller"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/master"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/registry"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 	"github.com/coreos/go-etcd/etcd"
 	"github.com/fsouza/go-dockerclient"
 )
@@ -86,13 +85,12 @@ func api_server() {
 
 // Starts up a controller manager. Never returns.
 func controller_manager() {
-	controllerManager := registry.MakeReplicationManager(etcd.NewClient([]string{*etcd_server}),
+	controllerManager := controller.MakeReplicationManager(etcd.NewClient([]string{*etcd_server}),
 		client.Client{
 			Host: fmt.Sprintf("http://%s:%d", *master_address, *master_port),
 		})
 
-	go util.Forever(func() { controllerManager.Synchronize() }, 20*time.Second)
-	go util.Forever(func() { controllerManager.WatchControllers() }, 20*time.Second)
+	controllerManager.Run(20 * time.Second)
 	select {}
 }