diff --git a/keyservice/client.go b/keyservice/client.go
index 8fa6cb7b9..f0a29fd06 100644
--- a/keyservice/client.go
+++ b/keyservice/client.go
@@ -8,7 +8,7 @@ import (
 
 // LocalClient is a key service client that performs all operations locally
 type LocalClient struct {
-	Server Server
+	Server KeyServiceServer
 }
 
 // NewLocalClient creates a new local client
@@ -16,6 +16,12 @@ func NewLocalClient() LocalClient {
 	return LocalClient{Server{}}
 }
 
+// NewCustomLocalClient creates a new local client with a non-default backing
+// KeyServiceServer implementation
+func NewCustomLocalClient(server KeyServiceServer) LocalClient {
+	return LocalClient{Server: server}
+}
+
 // Decrypt processes a decrypt request locally
 // See keyservice/server.go for more details
 func (c LocalClient) Decrypt(ctx context.Context,