diff --git a/tests/src/test/java/com/turn/ttorrent/CommunicationManagerFactory.java b/tests/src/test/java/com/turn/ttorrent/CommunicationManagerFactory.java
index 391b53aca..ed4be2948 100644
--- a/tests/src/test/java/com/turn/ttorrent/CommunicationManagerFactory.java
+++ b/tests/src/test/java/com/turn/ttorrent/CommunicationManagerFactory.java
@@ -16,7 +16,7 @@ public CommunicationManager getClient(String name) {
     final ExecutorService executorService = new ThreadPoolExecutor(
             DEFAULT_POOL_SIZE, DEFAULT_POOL_SIZE,
             0L, TimeUnit.MILLISECONDS,
-            new LinkedBlockingQueue<Runnable>(2000));
+            new LinkedBlockingQueue<Runnable>(4000));
     final ExecutorService pieceValidatorExecutor = new ThreadPoolExecutor(
             DEFAULT_POOL_SIZE, DEFAULT_POOL_SIZE,
             0L, TimeUnit.MILLISECONDS,
diff --git a/tests/src/test/java/com/turn/ttorrent/client/CommunicationManagerTest.java b/tests/src/test/java/com/turn/ttorrent/client/CommunicationManagerTest.java
index 2a9f71960..e01d385c6 100644
--- a/tests/src/test/java/com/turn/ttorrent/client/CommunicationManagerTest.java
+++ b/tests/src/test/java/com/turn/ttorrent/client/CommunicationManagerTest.java
@@ -1284,8 +1284,8 @@ protected boolean condition() {
   }
 
   public void testManySeeders() throws Exception {
-    File artifact = tempFiles.createTempFile(1024 * 1024 * 1024);
-    int seedersCount = 30;
+    File artifact = tempFiles.createTempFile(256 * 1024 * 1024);
+    int seedersCount = 15;
     TorrentMetadata torrent = TorrentCreator.create(artifact, this.tracker.getAnnounceURI(), "test");
     File torrentFile = tempFiles.createTempFile();
     saveTorrent(torrent, torrentFile);