diff --git a/signer/signer_trust.go b/signer/signer_trust.go
index a0a9168eb2..ac60e56ca7 100644
--- a/signer/signer_trust.go
+++ b/signer/signer_trust.go
@@ -14,8 +14,7 @@ import (
 	"google.golang.org/grpc/credentials"
 )
 
-// The only thing needed from grpc.ClientConn - specifying an interface
-// so that the connection can be stubbed out in tests.
+// The only thing needed from grpc.ClientConn is it's state.
 type checkableConnectionState interface {
 	State() grpc.ConnectivityState
 }
diff --git a/signer/signer_trust_test.go b/signer/signer_trust_test.go
index f27335ec0f..3776de91e4 100644
--- a/signer/signer_trust_test.go
+++ b/signer/signer_trust_test.go
@@ -23,7 +23,7 @@ func (c StubKeyManagementClient) CheckHealth(x context.Context,
 	if err != nil {
 		return nil, err
 	}
-	return &pb.HealthStatus{status}, nil
+	return &pb.HealthStatus{Status: status}, nil
 }
 
 type StubSignerClient struct {
@@ -37,7 +37,7 @@ func (c StubSignerClient) CheckHealth(x context.Context, v *pb.Void,
 	if err != nil {
 		return nil, err
 	}
-	return &pb.HealthStatus{status}, nil
+	return &pb.HealthStatus{Status: status}, nil
 }
 
 type StubGRPCConnection struct {