diff --git a/httpclient-simple/README.md b/httpclient-simple/README.md
index d1224359e0..b4d8d61993 100644
--- a/httpclient-simple/README.md
+++ b/httpclient-simple/README.md
@@ -8,4 +8,5 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 ### Relevant Articles: 
 
 - [HttpClient 4 – Get the Status Code](http://www.baeldung.com/httpclient-status-code)
-- [HttpClient with SSL](http://www.baeldung.com/httpclient-ssl)
\ No newline at end of file
+- [HttpClient with SSL](http://www.baeldung.com/httpclient-ssl)
+- [HttpClient Timeout](http://www.baeldung.com/httpclient-timeout)
\ No newline at end of file
diff --git a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientTimeoutLiveTest.java b/httpclient-simple/src/test/java/org/baeldung/httpclient/HttpClientTimeoutLiveTest.java
similarity index 96%
rename from httpclient/src/test/java/org/baeldung/httpclient/HttpClientTimeoutLiveTest.java
rename to httpclient-simple/src/test/java/org/baeldung/httpclient/HttpClientTimeoutLiveTest.java
index 74255e416c..9d14a20e22 100644
--- a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientTimeoutLiveTest.java
+++ b/httpclient-simple/src/test/java/org/baeldung/httpclient/HttpClientTimeoutLiveTest.java
@@ -1,20 +1,20 @@
 package org.baeldung.httpclient;
 
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.config.SocketConfig;
-import org.apache.http.conn.HttpHostConnectException;
+import org.apache.http.conn.ConnectTimeoutException;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.junit.After;
 import org.junit.Test;
 
-import java.io.IOException;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
-
 public class HttpClientTimeoutLiveTest {
 
     private CloseableHttpResponse response;
@@ -71,7 +71,7 @@ public class HttpClientTimeoutLiveTest {
     /**
      * This simulates a timeout against a domain with multiple routes/IPs to it (not a single raw IP)
      */
-    @Test(expected = HttpHostConnectException.class)
+    @Test(expected = ConnectTimeoutException.class)
     public final void givenTimeoutIsConfigured_whenTimingOut_thenTimeoutException() throws IOException {
         final int timeout = 3;
 
diff --git a/spring-security-rest-basic-auth/README.md b/spring-security-rest-basic-auth/README.md
index 0a48a747c2..b905824161 100644
--- a/spring-security-rest-basic-auth/README.md
+++ b/spring-security-rest-basic-auth/README.md
@@ -7,6 +7,5 @@ The "Learn Spring Security" Classes: http://github.learnspringsecurity.com
 
 ### Relevant Articles: 
 - [Basic Authentication with the RestTemplate](http://www.baeldung.com/how-to-use-resttemplate-with-basic-authentication-in-spring)
-- [HttpClient Timeout](http://www.baeldung.com/httpclient-timeout)
 - [A Custom Filter in the Spring Security Filter Chain](http://www.baeldung.com/spring-security-custom-filter)
 - [Spring Security Basic Authentication](http://www.baeldung.com/spring-security-basic-authentication)