diff --git a/transfer_service/task_executor.py b/transfer_service/task_executor.py
index 50afd0597b339c8e0d141d212dc6a44f447280d3..f5cdb184a22925a49f2c3508307ed18d7596487c 100644
--- a/transfer_service/task_executor.py
+++ b/transfer_service/task_executor.py
@@ -29,8 +29,11 @@ class TaskExecutor(Process):
         self.destQueue = None
         super(TaskExecutor, self).__init__()
 
-    def wait(self):
-        time.sleep(self.execWaitTime)
+    def wait(self, timeout = None):
+        if timeout is None:
+            time.sleep(self.execWaitTime)
+        else:
+            time.sleep(timeout)
 
     def setSourceQueueName(self, srcQueueName):
         self.srcQueue = JobQueue(srcQueueName)