diff --git a/test/python_client_test.py b/test/python_client_test.py
index <HASH>..<HASH> 100755
--- a/test/python_client_test.py
+++ b/test/python_client_test.py
@@ -29,6 +29,8 @@ def setUpModule():
   global vtgateclienttest_port
   global vtgateclienttest_grpc_port
 
+  environment.topo_server().setup()
+
   vtgateclienttest_port = environment.reserve_ports(1)
   args = environment.binary_args('vtgateclienttest') + [
       '-log_dir', environment.vtlogroot,
@@ -49,6 +51,8 @@ def tearDownModule():
   utils.kill_sub_process(vtgateclienttest_process, soft=True)
   vtgateclienttest_process.wait()
 
+  environment.topo_server().teardown()
+
 
 class TestPythonClient(unittest.TestCase):
   CONNECT_TIMEOUT = 10.0
test: Re-adding topo server setup.

I accidentally removed it here: <URL>