diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml
index 811cb476a4e..3036b9aba54 100644
--- a/hbase-assembly/pom.xml
+++ b/hbase-assembly/pom.xml
@@ -247,6 +247,14 @@
       <artifactId>hbase-spark</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore</artifactId>
+    </dependency>
   </dependencies>
 
   <profiles>
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 7fd6c76f6fc..2412c3bbb20 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -557,8 +557,6 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <!-- Overriden to get some SPNEGO classes only in newer version -->
-      <version>4.5.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>