diff --git a/tests/basic.py b/tests/basic.py
index 0171766..721f953 100644
--- a/tests/basic.py
+++ b/tests/basic.py
@@ -102,7 +102,7 @@
             raise Exception("Controller startup failed (no switch addr)")
         basic_logger.info("Connected " + str(self.controller.switch_addr))
         request = message.features_request()
-        reply, pkt = self.controller.transact(request, timeout=10)
+        reply, pkt = self.controller.transact(request)
         self.assertTrue(reply is not None,
                         "Did not complete features_request for handshake")
         self.supported_actions = reply.actions
@@ -284,7 +284,7 @@
                #@todo Check for unexpected messages?
                count = 0
                while True:
-                   (response, raw) = self.controller.poll(ofp.OFPT_PACKET_IN, 2)
+                   (response, raw) = self.controller.poll(ofp.OFPT_PACKET_IN)
                    if not response:  # Timeout
                        break
                    if dataplane.match_exp_pkt(pkt, response.data): # Got match
@@ -322,7 +322,7 @@
             self.dataplane.send(of_port, str(pkt))
             count = 0
             while True:
-                (response, raw) = self.controller.poll(ofp.OFPT_PACKET_IN, 2)
+                (response, raw) = self.controller.poll(ofp.OFPT_PACKET_IN)
                 if not response:  # Timeout
                     break
                 if dataplane.match_exp_pkt(pkt, response.data): # Got match
@@ -605,7 +605,7 @@
 
         # poll for error message
         while True:
-            (response, raw) = self.controller.poll(ofp.OFPT_ERROR, 2)
+            (response, raw) = self.controller.poll(ofp.OFPT_ERROR)
             if not response:  # Timeout
                 break
             if response.code == ofp.OFPPMFC_BAD_PORT:
@@ -628,7 +628,7 @@
         basic_logger.info("Running " + str(self))
         request = illegal_message.illegal_message_type()
 
-        reply, pkt = self.controller.transact(request, timeout=10)
+        reply, pkt = self.controller.transact(request)
         self.assertTrue(reply is not None, "Did not get response to bad req")
         self.assertTrue(reply.header.type == ofp.OFPT_ERROR,
                         "reply not an error message")
diff --git a/tests/bsn_ipmask.py b/tests/bsn_ipmask.py
index 0609582..cb64cb5 100644
--- a/tests/bsn_ipmask.py
+++ b/tests/bsn_ipmask.py
@@ -85,7 +85,7 @@
         m.data = struct.pack( "!LBBBBL", 1, index, 0, 0, 0, 0 )
         rc = self.controller.message_send(m)
         self.assertNotEqual(rc, -1, "Error sending get IP mask command")
-        m, r = self.controller.poll(ofp.OFPT_VENDOR, 2)
+        m, r = self.controller.poll(ofp.OFPT_VENDOR)
         self.assertEqual(m.vendor, 0x005c16c7, "Wrong vendor ID")
         x = struct.unpack("!LBBBBL", m.data)
         self.assertEqual(x[0], 2, "Wrong subtype")
diff --git a/tests/flow_query.py b/tests/flow_query.py
index bad4749..63e6cb5 100644
--- a/tests/flow_query.py
+++ b/tests/flow_query.py
@@ -1371,7 +1371,7 @@
         # </TBD>
         n = 0
         while True:
-            (resp, pkt) = self.controller.poll(ofp.OFPT_STATS_REPLY, 4)
+            (resp, pkt) = self.controller.poll(ofp.OFPT_STATS_REPLY)
             if resp is None:
                 return False            # Did not get expected response
             if n == 0:
@@ -1429,7 +1429,7 @@
 
     def barrier(self):
         barrier = message.barrier_request()
-        (resp, pkt) = self.controller.transact(barrier, 20)
+        (resp, pkt) = self.controller.transact(barrier, 30)
         return (resp is not None)
 
     def errors_verify(self, num_exp, type = 0, code = 0):
diff --git a/tests/pktact.py b/tests/pktact.py
index aca6766..660aa07 100644
--- a/tests/pktact.py
+++ b/tests/pktact.py
@@ -458,7 +458,7 @@
                 exp_port = None
 
                 while True:
-                    (response, raw) = self.controller.poll(ofp.OFPT_PACKET_IN, 2)
+                    (response, raw) = self.controller.poll(ofp.OFPT_PACKET_IN)
                     if not response:  # Timeout
                         break
                     if dataplane.match_exp_pkt(pkt, response.data): # Got match
diff --git a/tests/serial_failover.py b/tests/serial_failover.py
index 8ae5a46..d12040e 100644
--- a/tests/serial_failover.py
+++ b/tests/serial_failover.py
@@ -86,7 +86,7 @@
         self.assertTrue(self.controller.switch_addr is not None,
                         "Controller startup failed, no switch addr")
         request = message.features_request()
-        reply, pkt = self.controller.transact(request, timeout=10)
+        reply, pkt = self.controller.transact(request, timeout=20)
         self.assertTrue(reply is not None,
                         "Did not complete features_request for handshake")
         serial_failover_logger.info("Connected " +