diff --git a/services.go b/services.go
index 47e2ffcc2..edb8872e5 100644
--- a/services.go
+++ b/services.go
@@ -192,6 +192,9 @@ func WithInMemoryServices(ic *plugin.InitContext) ClientOpt {
 			plugin.SandboxStorePlugin: func(i interface{}) ServicesOpt {
 				return WithSandboxStore(i.(sandbox.Store))
 			},
+			plugin.SandboxControllerPlugin: func(i interface{}) ServicesOpt {
+				return WithSandboxController(i.(sandbox.Controller))
+			},
 		} {
 			i, err := ic.Get(t)
 			if err != nil {
@@ -229,9 +232,6 @@ func WithInMemoryServices(ic *plugin.InitContext) ClientOpt {
 			srv.IntrospectionService: func(s interface{}) ServicesOpt {
 				return WithIntrospectionClient(s.(introspectionapi.IntrospectionClient))
 			},
-			srv.SandboxControllerService: func(s interface{}) ServicesOpt {
-				return WithSandboxController(s.(sandbox.Controller))
-			},
 		} {
 			p := plugins[s]
 			if p == nil {
diff --git a/services/services.go b/services/services.go
index b3ebf68e2..d7255169f 100644
--- a/services/services.go
+++ b/services/services.go
@@ -33,10 +33,6 @@ const (
 	DiffService = "diff-service"
 	// IntrospectionService is the id of introspection service
 	IntrospectionService = "introspection-service"
-	// SandboxControllerService is the id of Sandbox's controller service
-	SandboxControllerService = "sandbox-controller-service"
-	// SandboxStoreService is the id of Sandbox's store service
-	SandboxStoreService = "sandbox-store-service"
 	// Streaming service is the id of the streaming service
 	StreamingService = "streaming-service"
 )