diff --git a/test/cpp/src/TestServer.cc b/test/cpp/src/TestServer.cc
index f2f9eca..db41b79 100644
--- a/test/cpp/src/TestServer.cc
+++ b/test/cpp/src/TestServer.cc
@@ -353,7 +353,7 @@
                                );
 
     printf("Starting the server on port %d...\n", port);
-    simpleServer.run();
+    simpleServer.serve();
 
   } else if (serverType == "thread-pool") {
 
@@ -374,7 +374,7 @@
 				       serverOptions);
 
     printf("Starting the server on port %d...\n", port);
-    threadPoolServer.run();
+    threadPoolServer.serve();
   }
 
   printf("done.\n");
diff --git a/test/py/TestServer.py b/test/py/TestServer.py
index f0f9ba1..96312c5 100755
--- a/test/py/TestServer.py
+++ b/test/py/TestServer.py
@@ -57,4 +57,4 @@
 processor = ThriftTest.Processor(handler, protocol)
 factory = TTransport.TBufferedTransportFactory()
 server = TServer.TSimpleServer(processor, transport, factory)
-server.run()
+server.serve()