diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml
index 209d22a08d7..6dd7bddc1b6 100644
--- a/hbase-rest/pom.xml
+++ b/hbase-rest/pom.xml
@@ -210,27 +210,11 @@
       <exclusions>
         <!--This dependency pulls in hadoop-minicluster
              which pulls in the below. It messes up
-             this build at assembly time. See HBASE-22029-->
+        this build at assembly time. See HBASE-22029 -->
         <exclusion>
          <groupId>com.sun.jersey</groupId>
          <artifactId>jersey-core</artifactId>
         </exclusion>
-        <exclusion>
-         <groupId>com.sun.jersey</groupId>
-         <artifactId>jersey-client</artifactId>
-        </exclusion>
-        <exclusion>
-         <groupId>com.sun.jersey</groupId>
-         <artifactId>jersey-server</artifactId>
-        </exclusion>
-        <exclusion>
-         <groupId>com.sun.jersey</groupId>
-         <artifactId>jersey-json</artifactId>
-        </exclusion>
-        <exclusion>
-         <groupId>com.sun.jersey.contribs</groupId>
-         <artifactId>jersey-guice</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -427,10 +411,6 @@
               <groupId>com.google.guava</groupId>
               <artifactId>guava</artifactId>
             </exclusion>
-            <exclusion>
-              <groupId>com.sun.jersey</groupId>
-              <artifactId>jersey-server</artifactId>
-            </exclusion>
           </exclusions>
         </dependency>
         <dependency>
@@ -510,24 +490,8 @@
           <scope>test</scope>
           <exclusions>
             <exclusion>
-              <groupId>com.sun.jersey</groupId>
-              <artifactId>jersey-client</artifactId>
-            </exclusion>
-            <!--
-            Can't exclude this one; dependency on com.sun.xml package
-              included from here.
-            <exclusion>
-              <groupId>com.sun.jersey</groupId>
-              <artifactId>jersey-json</artifactId>
-            </exclusion>
-            -->
-            <exclusion>
-              <groupId>com.sun.jersey.contribs</groupId>
-              <artifactId>jersey-guice</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>com.sun.jersey</groupId>
-              <artifactId>jersey-server</artifactId>
+              <groupId>com.google.guava</groupId>
+              <artifactId>guava</artifactId>
             </exclusion>
           </exclusions>
         </dependency>
diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSecureRESTServer.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSecureRESTServer.java
index 58f7c1078b9..01d81c2226f 100644
--- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSecureRESTServer.java
+++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSecureRESTServer.java
@@ -56,8 +56,8 @@ import org.apache.hadoop.hbase.security.access.AccessControlConstants;
 import org.apache.hadoop.hbase.security.access.AccessController;
 import org.apache.hadoop.hbase.security.access.Permission.Action;
 import org.apache.hadoop.hbase.security.token.TokenProvider;
+import org.apache.hadoop.hbase.testclassification.MediumTests;
 import org.apache.hadoop.hbase.testclassification.MiscTests;
-import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.Pair;
 import org.apache.hadoop.hdfs.DFSConfigKeys;
@@ -101,7 +101,7 @@ import org.slf4j.LoggerFactory;
  * Test class for SPNEGO authentication on the HttpServer. Uses Kerby's MiniKDC and Apache
  * HttpComponents to verify that a simple Servlet is reachable via SPNEGO and unreachable w/o.
  */
-@Category({MiscTests.class, SmallTests.class})
+@Category({MiscTests.class, MediumTests.class})
 public class TestSecureRESTServer {
 
   @ClassRule
diff --git a/pom.xml b/pom.xml
index a04ab95cd00..f5bb0ae4ed3 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2892,6 +2892,10 @@
                <groupId>io.netty</groupId>
                <artifactId>netty</artifactId>
              </exclusion>
+              <exclusion>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+              </exclusion>
               <exclusion>
                 <groupId>javax.inject</groupId>
                 <artifactId>javax.inject</artifactId>
@@ -2923,6 +2927,10 @@
                <groupId>io.netty</groupId>
                <artifactId>netty</artifactId>
              </exclusion>
+              <exclusion>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+              </exclusion>
            </exclusions>
          </dependency>
          <dependency>
@@ -2940,6 +2948,10 @@
                <groupId>io.netty</groupId>
                <artifactId>netty</artifactId>
              </exclusion>
+              <exclusion>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+              </exclusion>
            </exclusions>
          </dependency>
          <dependency>