diff --git a/cmd/boulder-publisher/main.go b/cmd/boulder-publisher/main.go
index c241ce8bb..3c57bf23d 100644
--- a/cmd/boulder-publisher/main.go
+++ b/cmd/boulder-publisher/main.go
@@ -52,17 +52,19 @@ func main() {
 			cmd.FailOnError(err, "Failed to setup gRPC server")
 			gw := bgrpc.NewPublisherServerWrapper(pubi)
 			pubPB.RegisterPublisherServer(s, gw)
-			err = s.Serve(l)
-			cmd.FailOnError(err, "gRPC service failed")
-		} else {
-			pubs, err := rpc.NewAmqpRPCServer(amqpConf, c.Publisher.MaxConcurrentRPCServerRequests, stats)
-			cmd.FailOnError(err, "Unable to create Publisher RPC server")
-			err = rpc.NewPublisherServer(pubs, pubi)
-			cmd.FailOnError(err, "Unable to setup Publisher RPC server")
-
-			err = pubs.Start(amqpConf)
-			cmd.FailOnError(err, "Unable to run Publisher RPC server")
+			go func() {
+				err = s.Serve(l)
+				cmd.FailOnError(err, "gRPC service failed")
+			}()
 		}
+
+		pubs, err := rpc.NewAmqpRPCServer(amqpConf, c.Publisher.MaxConcurrentRPCServerRequests, stats)
+		cmd.FailOnError(err, "Unable to create Publisher RPC server")
+		err = rpc.NewPublisherServer(pubs, pubi)
+		cmd.FailOnError(err, "Unable to setup Publisher RPC server")
+
+		err = pubs.Start(amqpConf)
+		cmd.FailOnError(err, "Unable to run Publisher RPC server")
 	}
 
 	app.Run()
diff --git a/test/boulder-config-next.json b/test/boulder-config-next.json
index a8e541f79..dd9d22ffa 100644
--- a/test/boulder-config-next.json
+++ b/test/boulder-config-next.json
@@ -353,6 +353,7 @@
     "amqp": {
       "serverURLFile": "test/secrets/amqp_url",
       "insecure": true,
+      "serviceQueue": "Publisher.server",
       "SA": {
         "server": "SA.server",
         "rpcTimeout": "15s"