diff --git a/src/python/grpcio/grpc/__init__.py b/src/python/grpcio/grpc/__init__.py
index 1c8508bbdeb313ef258b240a0ba76bd4524d8b26..cfad7de42f4e9f48bc3275b71b46fd33ff4d4ca1 100644
--- a/src/python/grpcio/grpc/__init__.py
+++ b/src/python/grpcio/grpc/__init__.py
@@ -1324,6 +1324,7 @@ __all__ = (
     'RpcMethodHandler',
     'HandlerCallDetails',
     'GenericRpcHandler',
+    'ServiceRpcHandler',
     'Server',
     'unary_unary_rpc_method_handler',
     'unary_stream_rpc_method_handler',
diff --git a/src/python/grpcio_tests/tests/unit/_api_test.py b/src/python/grpcio_tests/tests/unit/_api_test.py
index 2fe89499f51c8fa59bfe55ef960a72ca7d71ab9d..51dc4254208e10f2e98bb8c3c326e4c2fcd01ad5 100644
--- a/src/python/grpcio_tests/tests/unit/_api_test.py
+++ b/src/python/grpcio_tests/tests/unit/_api_test.py
@@ -65,6 +65,7 @@ class AllTest(unittest.TestCase):
         'RpcMethodHandler',
         'HandlerCallDetails',
         'GenericRpcHandler',
+        'ServiceRpcHandler',
         'Server',
         'unary_unary_rpc_method_handler',
         'unary_stream_rpc_method_handler',