diff --git a/utils/src/main/java/com/cloud/utils/nio/NioConnection.java b/utils/src/main/java/com/cloud/utils/nio/NioConnection.java
index 8e2481a3fd0..5c1e10f99c6 100644
--- a/utils/src/main/java/com/cloud/utils/nio/NioConnection.java
+++ b/utils/src/main/java/com/cloud/utils/nio/NioConnection.java
@@ -97,7 +97,7 @@ public abstract class NioConnection implements Callable<Boolean> {
         workerQueue = new LinkedBlockingQueue<>(5 * workers);
         _executor = new ThreadPoolExecutor(workers, 5 * workers, 1, TimeUnit.DAYS,
                 workerQueue, new NamedThreadFactory(name + "-Handler"), new ThreadPoolExecutor.AbortPolicy());
-        sslHandshakeQueue = new SynchronousQueue<>();
+        sslHandshakeQueue = new LinkedBlockingQueue<>(2 * sslHandshakeMaxWorkers);
         _sslHandshakeExecutor = new ThreadPoolExecutor(sslHandshakeMinWorkers, sslHandshakeMaxWorkers, 30,
                 TimeUnit.MINUTES, sslHandshakeQueue, new NamedThreadFactory(name + "-Handler"),
                 new ThreadPoolExecutor.AbortPolicy());
diff --git a/utils/src/test/java/com/cloud/utils/testcase/NioTest.java b/utils/src/test/java/com/cloud/utils/testcase/NioTest.java
index bc5b3aed227..4116f00deba 100644
--- a/utils/src/test/java/com/cloud/utils/testcase/NioTest.java
+++ b/utils/src/test/java/com/cloud/utils/testcase/NioTest.java
@@ -98,7 +98,7 @@ public class NioTest {
         testBytes = new byte[1000000];
         randomGenerator.nextBytes(testBytes);
 
-        server = new NioServer("NioTestServer", 0, 1, 1, 1, new NioTestServer(), null,  null);
+        server = new NioServer("NioTestServer", 0, 10, 1, 1, new NioTestServer(), null,  null);
         try {
             server.start();
         } catch (final NioConnectionException e) {