diff --git a/src/python/oftest/controller.py b/src/python/oftest/controller.py
index 3b2dc43..2ae2bd7 100644
--- a/src/python/oftest/controller.py
+++ b/src/python/oftest/controller.py
@@ -301,6 +301,8 @@
 
             with self.connect_cv:
                 (self.switch_socket, self.switch_addr) = (sock, addr)
+                self.switch_socket.setsockopt(socket.IPPROTO_TCP,
+                                              socket.TCP_NODELAY, True)
                 if self.initial_hello:
                     self.message_send(hello())
                 self.connect_cv.notify() # Notify anyone waiting
@@ -342,6 +344,7 @@
             soc.connect((self.switch, self.port))
             self.logger.info("Connected to " + self.switch + " on " +
                          str(self.port))
+            soc.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, True)
             self.switch_addr = (self.switch, self.port)
             return soc
         except (StandardError, socket.error), e: