diff --git a/include/grpc++/async_generic_service.h b/include/grpc++/async_generic_service.h
index 05fa76149e8..d10a56c7f78 100644
--- a/include/grpc++/async_generic_service.h
+++ b/include/grpc++/async_generic_service.h
@@ -59,12 +59,16 @@ class AsyncGenericService GRPC_FINAL {
  public:
   // TODO(yangg) Once we can add multiple completion queues to the server
   // in c core, add a CompletionQueue* argument to the ctor here.
-  AsyncGenericService() : server_(nullptr) {}
+  // TODO(yangg) support methods list.
+  AsyncGenericService(const grpc::string& methods) : server_(nullptr) {}
 
   void RequestCall(GenericServerContext* ctx,
                    GenericServerAsyncReaderWriter* reader_writer,
                    CompletionQueue* cq, void* tag);
 
+  // The new rpc event should be obtained from this completion queue.
+  CompletionQueue* completion_queue();
+
  private:
   friend class Server;
   Server* server_;
diff --git a/include/grpc++/server.h b/include/grpc++/server.h
index e05bde73495..8cd0a4f6681 100644
--- a/include/grpc++/server.h
+++ b/include/grpc++/server.h
@@ -70,8 +70,6 @@ class Server GRPC_FINAL : private CallHook,
   // function to ever return)
   void Wait();
 
-  CompletionQueue* cq() { return &cq_; }
-
  private:
   friend class AsyncGenericService;
   friend class ServerBuilder;
diff --git a/src/cpp/server/async_generic_service.cc b/src/cpp/server/async_generic_service.cc
index 67241fee7e9..2009af7cbd1 100644
--- a/src/cpp/server/async_generic_service.cc
+++ b/src/cpp/server/async_generic_service.cc
@@ -43,5 +43,9 @@ void AsyncGenericService::RequestCall(
   server_->RequestAsyncGenericCall(ctx, reader_writer, cq, tag);
 }
 
+CompletionQueue* AsyncGenericService::completion_queue() {
+  return &server_->cq_;
+}
+
 } // namespace grpc
 
diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc
index ac350df62db..4d5e77e6337 100644
--- a/src/cpp/server/server.cc
+++ b/src/cpp/server/server.cc
@@ -211,7 +211,7 @@ bool Server::RegisterService(RpcService* service) {
 
 bool Server::RegisterAsyncService(AsynchronousService* service) {
   GPR_ASSERT(service->dispatch_impl_ == nullptr &&
-             "Can only register one asynchronous service against one server.");
+             "Can only register an asynchronous service against one server.");
   service->dispatch_impl_ = this;
   service->request_args_ = new void* [service->method_count_];
   for (size_t i = 0; i < service->method_count_; ++i) {
@@ -230,7 +230,7 @@ bool Server::RegisterAsyncService(AsynchronousService* service) {
 
 void Server::RegisterAsyncGenericService(AsyncGenericService* service) {
   GPR_ASSERT(service->server_ == nullptr &&
-             "Can only register one generic service against one server.");
+             "Can only register an async generic service against one server.");
   service->server_ = this;
 }
 
diff --git a/test/cpp/end2end/generic_end2end_test.cc b/test/cpp/end2end/generic_end2end_test.cc
index 102f1c758b8..4a0d2c5c01d 100644
--- a/test/cpp/end2end/generic_end2end_test.cc
+++ b/test/cpp/end2end/generic_end2end_test.cc
@@ -91,7 +91,7 @@ bool ParseFromByteBuffer(ByteBuffer* buffer, grpc::protobuf::Message* message) {
 
 class GenericEnd2endTest : public ::testing::Test {
  protected:
-  GenericEnd2endTest() {}
+  GenericEnd2endTest() :  generic_service_("*") {}
 
   void SetUp() GRPC_OVERRIDE {
     int port = grpc_pick_unused_port_or_die();
@@ -145,7 +145,7 @@ class GenericEnd2endTest : public ::testing::Test {
 
       generic_service_.RequestCall(&srv_ctx, &stream, &srv_cq_, tag(2));
 
-      verify_ok(server_->cq(), 2, true);
+      verify_ok(generic_service_.completion_queue(), 2, true);
       EXPECT_EQ(server_address_.str(), srv_ctx.host());
       EXPECT_EQ("/grpc.cpp.test.util.TestService/Echo", srv_ctx.method());
       ByteBuffer recv_buffer;
@@ -212,7 +212,7 @@ TEST_F(GenericEnd2endTest, SimpleBidiStreaming) {
 
   generic_service_.RequestCall(&srv_ctx, &srv_stream, &srv_cq_, tag(2));
 
-  verify_ok(server_->cq(), 2, true);
+  verify_ok(generic_service_.completion_queue(), 2, true);
   EXPECT_EQ(server_address_.str(), srv_ctx.host());
   EXPECT_EQ("/grpc.cpp.test.util.TestService/BidiStream", srv_ctx.method());