diff --git a/core/pom.xml b/core/pom.xml
index 83c708dfc9619..d669b2410373c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -42,6 +42,10 @@
           <groupId>javax.servlet</groupId>
           <artifactId>servlet-api</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.jboss.netty</groupId>
+          <artifactId>netty</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 556b9da3d6d90..ce6dc00d9aaa4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1222,6 +1222,12 @@
           <artifactId>zookeeper</artifactId>
           <version>${zookeeper.version}</version>
           <scope>provided</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>org.jboss.netty</groupId>
+              <artifactId>netty</artifactId>
+            </exclusion>
+          </exclusions>
         </dependency>
       </dependencies>
     </profile>
diff --git a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2Suite.scala b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2Suite.scala
index 38977ff162097..ca29cb730ca2a 100644
--- a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2Suite.scala
+++ b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2Suite.scala
@@ -108,6 +108,7 @@ class HiveThriftServer2Suite extends FunSuite with Logging {
             logError(s"Failed to start Hive Thrift server within $timeout", cause)
           case _ =>
         }
+
         logError(
           s"""
              |=====================================