2 files changed, 5 insertions, 2 deletions
diff --git a/python/qpid/tests/messaging/__init__.py b/python/qpid/tests/messaging/__init__.py
index ddacf77609..8f6680d5e3 100644
--- a/python/qpid/tests/messaging/__init__.py
+++ b/python/qpid/tests/messaging/__init__.py
@@ -56,7 +56,7 @@ class Base(Test):
       self.conn = None
 
   def teardown_connection(self, conn):
-    conn.close()
+    conn.close(timeout=self.timeout())
 
   def content(self, base, count = None):
     if count is None:
@@ -159,6 +159,9 @@ class Base(Test):
   def delay(self):
     return float(self.config.defines.get("delay", "2"))
 
+  def timeout(self):
+    return float(self.config.defines.get("timeout", "60"))
+
   def get_bool(self, name):
     return self.config.defines.get(name, "false").lower() in ("true", "yes", "1")
 
diff --git a/python/qpid/tests/messaging/endpoints.py b/python/qpid/tests/messaging/endpoints.py
index 185a90b994..60723114fe 100644
--- a/python/qpid/tests/messaging/endpoints.py
+++ b/python/qpid/tests/messaging/endpoints.py
@@ -710,7 +710,7 @@ class ReceiverTests(Base):
 
   def fetchFromConcurrentCloseTest(self, entry):
     def closer():
-      time.sleep(self.delay())
+      self.sleep()
       entry.close()
     t = Thread(target=closer)
     t.start()