diff --git a/pkg/registry/registrytest/controller.go b/pkg/registry/registrytest/controller.go
deleted file mode 100644
index cfaf03ba60..0000000000
--- a/pkg/registry/registrytest/controller.go
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-Copyright 2014 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package registrytest
-
-import (
-	"sync"
-
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/fields"
-	"k8s.io/kubernetes/pkg/labels"
-	"k8s.io/kubernetes/pkg/watch"
-)
-
-// TODO: Why do we have this AND MemoryRegistry?
-type ControllerRegistry struct {
-	Err         error
-	Controllers *api.ReplicationControllerList
-	sync.Mutex
-}
-
-func (r *ControllerRegistry) SetError(err error) {
-	r.Lock()
-	defer r.Unlock()
-	r.Err = err
-}
-
-func (r *ControllerRegistry) ListControllers(ctx api.Context) (*api.ReplicationControllerList, error) {
-	r.Lock()
-	defer r.Unlock()
-	return r.Controllers, r.Err
-}
-
-func (r *ControllerRegistry) GetController(ctx api.Context, ID string) (*api.ReplicationController, error) {
-	r.Lock()
-	defer r.Unlock()
-	if r.Controllers != nil {
-		for _, rc := range r.Controllers.Items {
-			if ID == rc.Name {
-				return &r.Controllers.Items[0], r.Err
-			}
-		}
-	}
-	return &api.ReplicationController{}, r.Err
-}
-
-func (r *ControllerRegistry) CreateController(ctx api.Context, controller *api.ReplicationController) (*api.ReplicationController, error) {
-	r.Lock()
-	defer r.Unlock()
-	if r.Controllers != nil {
-		r.Controllers.Items = append(r.Controllers.Items, *controller)
-	}
-	return controller, r.Err
-}
-
-func (r *ControllerRegistry) UpdateController(ctx api.Context, controller *api.ReplicationController) (*api.ReplicationController, error) {
-	r.Lock()
-	defer r.Unlock()
-	return controller, r.Err
-}
-
-func (r *ControllerRegistry) DeleteController(ctx api.Context, ID string) error {
-	r.Lock()
-	defer r.Unlock()
-	return r.Err
-}
-
-func (r *ControllerRegistry) WatchControllers(ctx api.Context, label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) {
-	r.Lock()
-	defer r.Unlock()
-	return nil, r.Err
-}
diff --git a/pkg/registry/registrytest/pod.go b/pkg/registry/registrytest/pod.go
deleted file mode 100644
index 5cefa4bccf..0000000000
--- a/pkg/registry/registrytest/pod.go
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-Copyright 2014 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package registrytest
-
-import (
-	"sync"
-
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/fields"
-	"k8s.io/kubernetes/pkg/labels"
-	"k8s.io/kubernetes/pkg/watch"
-)
-
-type PodRegistry struct {
-	Err  error
-	Pod  *api.Pod
-	Pods *api.PodList
-	sync.Mutex
-
-	broadcaster *watch.Broadcaster
-}
-
-func NewPodRegistry(pods *api.PodList) *PodRegistry {
-	return &PodRegistry{
-		Pods:        pods,
-		broadcaster: watch.NewBroadcaster(0, watch.WaitIfChannelFull),
-	}
-}
-
-func (r *PodRegistry) SetError(err error) {
-	r.Lock()
-	defer r.Unlock()
-	r.Err = err
-}
-
-func (r *PodRegistry) ListPodsPredicate(ctx api.Context, filter func(*api.Pod) bool) (*api.PodList, error) {
-	r.Lock()
-	defer r.Unlock()
-	if r.Err != nil {
-		return nil, r.Err
-	}
-	var filtered []api.Pod
-	for _, pod := range r.Pods.Items {
-		if filter(&pod) {
-			filtered = append(filtered, pod)
-		}
-	}
-	pods := *r.Pods
-	pods.Items = filtered
-	return &pods, nil
-}
-
-func (r *PodRegistry) ListPods(ctx api.Context, selector labels.Selector) (*api.PodList, error) {
-	return r.ListPodsPredicate(ctx, func(pod *api.Pod) bool {
-		return selector.Matches(labels.Set(pod.Labels))
-	})
-}
-
-func (r *PodRegistry) WatchPods(ctx api.Context, label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) {
-	return r.broadcaster.Watch(), nil
-}
-
-func (r *PodRegistry) GetPod(ctx api.Context, podId string) (*api.Pod, error) {
-	r.Lock()
-	defer r.Unlock()
-	return r.Pod, r.Err
-}
-
-func (r *PodRegistry) CreatePod(ctx api.Context, pod *api.Pod) error {
-	r.Lock()
-	defer r.Unlock()
-	r.Pod = pod
-	r.broadcaster.Action(watch.Added, pod)
-	return r.Err
-}
-
-func (r *PodRegistry) UpdatePod(ctx api.Context, pod *api.Pod) error {
-	r.Lock()
-	defer r.Unlock()
-	r.Pod = pod
-	r.broadcaster.Action(watch.Modified, pod)
-	return r.Err
-}
-
-func (r *PodRegistry) DeletePod(ctx api.Context, podId string) error {
-	r.Lock()
-	defer r.Unlock()
-	r.broadcaster.Action(watch.Deleted, r.Pod)
-	return r.Err
-}
diff --git a/pkg/registry/registrytest/scheduler.go b/pkg/registry/registrytest/scheduler.go
deleted file mode 100644
index 93700b8a3e..0000000000
--- a/pkg/registry/registrytest/scheduler.go
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2014 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package registrytest
-
-import (
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm"
-)
-
-type Scheduler struct {
-	Err     error
-	Pod     *api.Pod
-	Machine string
-}
-
-func (s *Scheduler) Schedule(pod *api.Pod, lister algorithm.MinionLister) (string, error) {
-	s.Pod = pod
-	return s.Machine, s.Err
-}