diff --git a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientConnectionManagementTest.java b/httpclient/src/test/java/org/baeldung/httpclient/conn/HttpClientConnectionManagementTest.java
similarity index 95%
rename from httpclient/src/test/java/org/baeldung/httpclient/HttpClientConnectionManagementTest.java
rename to httpclient/src/test/java/org/baeldung/httpclient/conn/HttpClientConnectionManagementTest.java
index 293564086f..934c4bd761 100644
--- a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientConnectionManagementTest.java
+++ b/httpclient/src/test/java/org/baeldung/httpclient/conn/HttpClientConnectionManagementTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.httpclient;
+package org.baeldung.httpclient.conn;
 
 import static org.junit.Assert.assertTrue;
 
@@ -109,18 +109,12 @@ public class HttpClientConnectionManagementTest {
     // 3
 
     @Test
-    // @Ignore
-    public final void whenPollingConnectionManagerIsConfiguredOnHttpClient_thenNoExceptions() throws InterruptedException {
+    public final void whenPollingConnectionManagerIsConfiguredOnHttpClient_thenNoExceptions() throws InterruptedException, ClientProtocolException, IOException {
         poolingConnManager = new PoolingHttpClientConnectionManager();
-        final CloseableHttpClient client1 = HttpClients.custom().setConnectionManager(poolingConnManager).build();
-        final CloseableHttpClient client2 = HttpClients.custom().setConnectionManager(poolingConnManager).build();
-        final TesterVersion_MultiHttpClientConnThread thread1 = new TesterVersion_MultiHttpClientConnThread(client1, get1, poolingConnManager);
-        final TesterVersion_MultiHttpClientConnThread thread2 = new TesterVersion_MultiHttpClientConnThread(client2, get2, poolingConnManager);
-        thread1.start();
-        thread1.join();
-        thread2.start();
-        thread2.join(1000);
-        assertTrue(poolingConnManager.getTotalStats().getLeased() == 2);
+        client = HttpClients.custom().setConnectionManager(poolingConnManager).build();
+        client.execute(get1);
+
+        assertTrue(poolingConnManager.getTotalStats().getLeased() == 1);
     }
 
     @Test
@@ -149,8 +143,8 @@ public class HttpClientConnectionManagementTest {
         final MultiHttpClientConnThread thread1 = new MultiHttpClientConnThread(client1, get1);
         final MultiHttpClientConnThread thread2 = new MultiHttpClientConnThread(client2, get2);
         thread1.start();
-        thread1.join();
         thread2.start();
+        thread1.join();
         thread2.join();
     }
 
diff --git a/httpclient/src/test/java/org/baeldung/httpclient/IdleConnectionMonitorThread.java b/httpclient/src/test/java/org/baeldung/httpclient/conn/IdleConnectionMonitorThread.java
similarity index 96%
rename from httpclient/src/test/java/org/baeldung/httpclient/IdleConnectionMonitorThread.java
rename to httpclient/src/test/java/org/baeldung/httpclient/conn/IdleConnectionMonitorThread.java
index 4c4c7f36a1..cd0acef09b 100644
--- a/httpclient/src/test/java/org/baeldung/httpclient/IdleConnectionMonitorThread.java
+++ b/httpclient/src/test/java/org/baeldung/httpclient/conn/IdleConnectionMonitorThread.java
@@ -1,4 +1,4 @@
-package org.baeldung.httpclient;
+package org.baeldung.httpclient.conn;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/httpclient/src/test/java/org/baeldung/httpclient/MultiHttpClientConnThread.java b/httpclient/src/test/java/org/baeldung/httpclient/conn/MultiHttpClientConnThread.java
similarity index 98%
rename from httpclient/src/test/java/org/baeldung/httpclient/MultiHttpClientConnThread.java
rename to httpclient/src/test/java/org/baeldung/httpclient/conn/MultiHttpClientConnThread.java
index e2f8fabbdf..b21684fdbb 100644
--- a/httpclient/src/test/java/org/baeldung/httpclient/MultiHttpClientConnThread.java
+++ b/httpclient/src/test/java/org/baeldung/httpclient/conn/MultiHttpClientConnThread.java
@@ -1,4 +1,4 @@
-package org.baeldung.httpclient;
+package org.baeldung.httpclient.conn;
 
 import java.io.IOException;
 import java.util.logging.Level;
diff --git a/httpclient/src/test/java/org/baeldung/httpclient/TesterVersion_MultiHttpClientConnThread.java b/httpclient/src/test/java/org/baeldung/httpclient/conn/TesterVersion_MultiHttpClientConnThread.java
similarity index 97%
rename from httpclient/src/test/java/org/baeldung/httpclient/TesterVersion_MultiHttpClientConnThread.java
rename to httpclient/src/test/java/org/baeldung/httpclient/conn/TesterVersion_MultiHttpClientConnThread.java
index 131761b072..9562ffbae1 100644
--- a/httpclient/src/test/java/org/baeldung/httpclient/TesterVersion_MultiHttpClientConnThread.java
+++ b/httpclient/src/test/java/org/baeldung/httpclient/conn/TesterVersion_MultiHttpClientConnThread.java
@@ -1,4 +1,4 @@
-package org.baeldung.httpclient;
+package org.baeldung.httpclient.conn;
 
 import java.io.IOException;
 import java.util.logging.Level;