diff --git a/storm-client/test/jvm/org/apache/storm/executor/ExecutorTransferMultiThreadingTest.java b/storm-client/test/jvm/org/apache/storm/executor/ExecutorTransferMultiThreadingTest.java
index 5dcb128..03240c8 100644
--- a/storm-client/test/jvm/org/apache/storm/executor/ExecutorTransferMultiThreadingTest.java
+++ b/storm-client/test/jvm/org/apache/storm/executor/ExecutorTransferMultiThreadingTest.java
@@ -126,7 +126,7 @@
         }
 
         //give producers enough time to insert messages into the queue
-        executorService.awaitTermination(100, TimeUnit.MILLISECONDS);
+        executorService.awaitTermination(1000, TimeUnit.MILLISECONDS);
 
         //consume all the tuples in the queue and deserialize them one by one
         //this mimics a remote worker.
@@ -134,6 +134,7 @@
         SingleThreadedConsumer consumer = new SingleThreadedConsumer(deserializer, producerTaskNum);
         transferQueue.consume(consumer);
         consumer.finalCheck();
+        executorService.shutdown();
     }
 
     private Runnable createProducerTask(ExecutorTransfer executorTransfer) {