diff --git a/httpclient/pom.xml b/httpclient/pom.xml
index 17675efcea..a4ec3efaa0 100644
--- a/httpclient/pom.xml
+++ b/httpclient/pom.xml
@@ -45,13 +45,13 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>fluent-hc</artifactId>
-			<version>4.3.3</version>
+			<version>${httpclient.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpmime</artifactId>
-			<version>4.3.3</version>
+			<version>${httpclient.version}</version>
 		</dependency>
 
 		<dependency>
@@ -157,8 +157,8 @@
 		<mysql-connector-java.version>5.1.30</mysql-connector-java.version>
 
 		<!-- logging -->
-		<org.slf4j.version>1.7.6</org.slf4j.version>
-		<logback.version>1.1.1</logback.version>
+		<org.slf4j.version>1.7.7</org.slf4j.version>
+		<logback.version>1.1.2</logback.version>
 
 		<!-- various -->
 		<hibernate-validator.version>5.1.1.Final</hibernate-validator.version>
@@ -173,9 +173,9 @@
 		<mockito.version>1.9.5</mockito.version>
 
 		<httpcore.version>4.3.2</httpcore.version>
-		<httpclient.version>4.3.3</httpclient.version>
+		<httpclient.version>4.3.4</httpclient.version>
 
-		<rest-assured.version>2.3.1</rest-assured.version>
+		<rest-assured.version>2.3.2</rest-assured.version>
 
 		<!-- maven plugins -->
 		<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
diff --git a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientConnectionManagementTest.java b/httpclient/src/test/java/org/baeldung/httpclient/HttpClientConnectionManagementTest.java
new file mode 100644
index 0000000000..a761338738
--- /dev/null
+++ b/httpclient/src/test/java/org/baeldung/httpclient/HttpClientConnectionManagementTest.java
@@ -0,0 +1,5 @@
+package org.baeldung.httpclient;
+
+public class HttpClientConnectionManagementTest {
+    //
+}
diff --git a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientBasicLiveTest.java b/httpclient/src/test/java/org/baeldung/httpclient/base/HttpClientBasicLiveTest.java
similarity index 98%
rename from httpclient/src/test/java/org/baeldung/httpclient/HttpClientBasicLiveTest.java
rename to httpclient/src/test/java/org/baeldung/httpclient/base/HttpClientBasicLiveTest.java
index 10f0b9e149..2a101ec816 100644
--- a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientBasicLiveTest.java
+++ b/httpclient/src/test/java/org/baeldung/httpclient/base/HttpClientBasicLiveTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.httpclient;
+package org.baeldung.httpclient.base;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.notNullValue;
diff --git a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientBasicPostLiveTest.java b/httpclient/src/test/java/org/baeldung/httpclient/base/HttpClientBasicPostLiveTest.java
similarity index 98%
rename from httpclient/src/test/java/org/baeldung/httpclient/HttpClientBasicPostLiveTest.java
rename to httpclient/src/test/java/org/baeldung/httpclient/base/HttpClientBasicPostLiveTest.java
index 3dd4a988b0..7eb078b18b 100644
--- a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientBasicPostLiveTest.java
+++ b/httpclient/src/test/java/org/baeldung/httpclient/base/HttpClientBasicPostLiveTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.httpclient;
+package org.baeldung.httpclient.base;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientLiveTest.java b/httpclient/src/test/java/org/baeldung/httpclient/base/HttpClientLiveTest.java
similarity index 99%
rename from httpclient/src/test/java/org/baeldung/httpclient/HttpClientLiveTest.java
rename to httpclient/src/test/java/org/baeldung/httpclient/base/HttpClientLiveTest.java
index 3a54b7e1b8..23c1fdf430 100644
--- a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientLiveTest.java
+++ b/httpclient/src/test/java/org/baeldung/httpclient/base/HttpClientLiveTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.httpclient;
+package org.baeldung.httpclient.base;
 
 import static org.hamcrest.Matchers.emptyArray;
 import static org.hamcrest.Matchers.not;
diff --git a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientSandboxLiveTest.java b/httpclient/src/test/java/org/baeldung/httpclient/base/HttpClientSandboxLiveTest.java
similarity index 98%
rename from httpclient/src/test/java/org/baeldung/httpclient/HttpClientSandboxLiveTest.java
rename to httpclient/src/test/java/org/baeldung/httpclient/base/HttpClientSandboxLiveTest.java
index d8e687df1b..ff2f1cd194 100644
--- a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientSandboxLiveTest.java
+++ b/httpclient/src/test/java/org/baeldung/httpclient/base/HttpClientSandboxLiveTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.httpclient;
+package org.baeldung.httpclient.base;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientUnshortenLiveTest.java b/httpclient/src/test/java/org/baeldung/httpclient/rare/HttpClientUnshortenLiveTest.java
similarity index 99%
rename from httpclient/src/test/java/org/baeldung/httpclient/HttpClientUnshortenLiveTest.java
rename to httpclient/src/test/java/org/baeldung/httpclient/rare/HttpClientUnshortenLiveTest.java
index 7eef1cade8..8fd61664a2 100644
--- a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientUnshortenLiveTest.java
+++ b/httpclient/src/test/java/org/baeldung/httpclient/rare/HttpClientUnshortenLiveTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.httpclient;
+package org.baeldung.httpclient.rare;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;
diff --git a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientAuthLiveTest.java b/httpclient/src/test/java/org/baeldung/httpclient/sec/HttpClientAuthLiveTest.java
similarity index 99%
rename from httpclient/src/test/java/org/baeldung/httpclient/HttpClientAuthLiveTest.java
rename to httpclient/src/test/java/org/baeldung/httpclient/sec/HttpClientAuthLiveTest.java
index 65aa059e62..2f9a2a6058 100644
--- a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientAuthLiveTest.java
+++ b/httpclient/src/test/java/org/baeldung/httpclient/sec/HttpClientAuthLiveTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.httpclient;
+package org.baeldung.httpclient.sec;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;
diff --git a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientCookieLiveTest.java b/httpclient/src/test/java/org/baeldung/httpclient/sec/HttpClientCookieLiveTest.java
similarity index 99%
rename from httpclient/src/test/java/org/baeldung/httpclient/HttpClientCookieLiveTest.java
rename to httpclient/src/test/java/org/baeldung/httpclient/sec/HttpClientCookieLiveTest.java
index 3cca95b7bc..a36569a34b 100644
--- a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientCookieLiveTest.java
+++ b/httpclient/src/test/java/org/baeldung/httpclient/sec/HttpClientCookieLiveTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.httpclient;
+package org.baeldung.httpclient.sec;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;