diff --git a/pkg/master/BUILD b/pkg/master/BUILD
index 0d31356af4f..a7c30df312f 100644
--- a/pkg/master/BUILD
+++ b/pkg/master/BUILD
@@ -117,7 +117,6 @@ go_test(
         "//pkg/generated/openapi:go_default_library",
         "//pkg/genericapiserver:go_default_library",
         "//pkg/kubelet/client:go_default_library",
-        "//pkg/registry/registrytest:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/runtime/schema:go_default_library",
         "//pkg/storage/etcd/testing:go_default_library",
diff --git a/pkg/master/controller.go b/pkg/master/controller.go
index 47e4a27dfb0..2552c494249 100644
--- a/pkg/master/controller.go
+++ b/pkg/master/controller.go
@@ -265,8 +265,8 @@ func (c *Controller) CreateOrUpdateMasterServiceIfNeeded(serviceName string, ser
 	}
 
 	_, err := c.ServiceClient.Services(api.NamespaceDefault).Create(svc)
-	if err != nil && errors.IsAlreadyExists(err) {
-		err = nil
+	if errors.IsAlreadyExists(err) {
+		return c.CreateOrUpdateMasterServiceIfNeeded(serviceName, serviceIP, servicePorts, serviceType, reconcile)
 	}
 	return err
 }
diff --git a/pkg/master/controller_test.go b/pkg/master/controller_test.go
index f8854650f1e..4a61a10776b 100644
--- a/pkg/master/controller_test.go
+++ b/pkg/master/controller_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package master
 
 import (
-	"errors"
 	"net"
 	"reflect"
 	"testing"
@@ -25,7 +24,6 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"
 	"k8s.io/kubernetes/pkg/client/testing/core"
-	"k8s.io/kubernetes/pkg/registry/registrytest"
 	"k8s.io/kubernetes/pkg/util/intstr"
 )
 
@@ -578,10 +576,6 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
 	}
 	for _, test := range create_tests {
 		master := Controller{}
-		registry := &registrytest.ServiceRegistry{
-			Err: errors.New("unable to get svc"),
-		}
-		master.ServiceRegistry = registry
 		fakeClient := fake.NewSimpleClientset()
 		master.ServiceClient = fakeClient.Core()
 		master.CreateOrUpdateMasterServiceIfNeeded(test.serviceName, net.ParseIP("1.2.3.4"), test.servicePorts, test.serviceType, false)
@@ -602,7 +596,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
 			}
 		}
 		if test.expectCreate == nil && len(creates) > 1 {
-			t.Errorf("case %q: no create expected, yet saw: %v", test.testName, registry.List.Items)
+			t.Errorf("case %q: no create expected, yet saw: %v", test.testName, creates)
 		}
 	}
 
@@ -864,10 +858,6 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
 	}
 	for _, test := range reconcile_tests {
 		master := Controller{}
-		registry := &registrytest.ServiceRegistry{
-			Service: test.service,
-		}
-		master.ServiceRegistry = registry
 		fakeClient := fake.NewSimpleClientset(test.service)
 		master.ServiceClient = fakeClient.Core()
 		err := master.CreateOrUpdateMasterServiceIfNeeded(test.serviceName, net.ParseIP("1.2.3.4"), test.servicePorts, test.serviceType, true)
@@ -891,7 +881,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
 			}
 		}
 		if test.expectUpdate == nil && len(updates) > 0 {
-			t.Errorf("case %q: no update expected, yet saw: %v", test.testName, registry.Updates)
+			t.Errorf("case %q: no update expected, yet saw: %v", test.testName, updates)
 		}
 	}
 
@@ -927,10 +917,6 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
 	}
 	for _, test := range non_reconcile_tests {
 		master := Controller{}
-		registry := &registrytest.ServiceRegistry{
-			Service: test.service,
-		}
-		master.ServiceRegistry = registry
 		fakeClient := fake.NewSimpleClientset(test.service)
 		master.ServiceClient = fakeClient.Core()
 		err := master.CreateOrUpdateMasterServiceIfNeeded(test.serviceName, net.ParseIP("1.2.3.4"), test.servicePorts, test.serviceType, false)
@@ -954,7 +940,7 @@ func TestCreateOrUpdateMasterService(t *testing.T) {
 			}
 		}
 		if test.expectUpdate == nil && len(updates) > 0 {
-			t.Errorf("case %q: no update expected, yet saw: %v", test.testName, registry.Updates)
+			t.Errorf("case %q: no update expected, yet saw: %v", test.testName, updates)
 		}
 	}
 }