diff --git a/lib/cpp/src/server/TServer.h b/lib/cpp/src/server/TServer.h
index eb23b45..293aa28 100644
--- a/lib/cpp/src/server/TServer.h
+++ b/lib/cpp/src/server/TServer.h
@@ -21,10 +21,13 @@
  *
  * @author Mark Slee <mcslee@facebook.com>
  */
-class TServer {
+class TServer : public concurrency::Runnable {
 public:
   virtual ~TServer() {}
   virtual void serve() = 0;
+
+  // Allows running the server as a Runnable thread
+  virtual void run() { serve(); }
   
   shared_ptr<TProcessor> getProcessor() {
     return processor_;