diff --git a/bin/phoenix_queryserver_utils.py b/bin/phoenix_queryserver_utils.py
index 2013873..190c9dd 100755
--- a/bin/phoenix_queryserver_utils.py
+++ b/bin/phoenix_queryserver_utils.py
@@ -85,6 +85,7 @@ def setPath():
     PHOENIX_LOADBALANCER_JAR_PATTERN = "load-balancer-*[!t][!e][!s][!t][!s].jar"
     SQLLINE_WITH_DEPS_PATTERN = "sqlline-*-jar-with-dependencies.jar"
     SLF4J_BACKEND_JAR_PATTERN = "log4j-slf4j*.jar"
+    JCL_OVER_SLF4J_PATTERN = "jcl-over-slf4j*.jar"
     LOGGING_JAR_PATTERN = "log4j-core*.jar"
     LOGGING_JAR_PATTERN2 = "log4j-api*.jar"
     LOGGING_JAR_PATTERN3 = "log4j-1.2-api*.jar"
@@ -172,6 +173,9 @@ def setPath():
     if slf4j_backend_jar is None or slf4j_backend_jar == "":
         slf4j_backend_jar = findFileInPathWithoutRecursion(SLF4J_BACKEND_JAR_PATTERN, os.path.join(current_dir, "..","lib"))
 
+    global jcl_over_slf4j
+    jcl_over_slf4j = findFileInPathWithoutRecursion(JCL_OVER_SLF4J_PATTERN, os.path.join(current_dir, "..","lib"))
+
     global logging_jar
     logging_jar = os.environ.get(OVERRIDE_LOGGING)
     if logging_jar is None or logging_jar == "":
@@ -290,6 +294,7 @@ def common_sqlline_args(parser):
     print("phoenix_thin_client_jar:", phoenix_thin_client_jar)
     print("sqlline_with_deps_jar", sqlline_with_deps_jar)
     print("slf4j_backend_jar:", slf4j_backend_jar)
+    print("jcl_over_slf4j:", jcl_over_slf4j)
     print("java_home:", java_home)
     print("java:", java)
     print("jvm_module_flags:", jvm_module_flags)
diff --git a/bin/queryserver.py b/bin/queryserver.py
index 8120d9b..13e8a74 100755
--- a/bin/queryserver.py
+++ b/bin/queryserver.py
@@ -100,6 +100,7 @@
     hadoop_conf_dir + os.pathsep + \
     phoenix_queryserver_utils.slf4j_backend_jar + os.pathsep + \
     phoenix_queryserver_utils.logging_jar + os.pathsep + \
+    phoenix_queryserver_utils.jcl_over_slf4j + os.pathsep + \
     phoenix_queryserver_utils.phoenix_client_jar + os.pathsep + \
     phoenix_queryserver_utils.phoenix_queryserver_jar + \
     " -Dproc_phoenixserver" + \
diff --git a/phoenix-queryserver-assembly/pom.xml b/phoenix-queryserver-assembly/pom.xml
index f3bb867..8fb7211 100644
--- a/phoenix-queryserver-assembly/pom.xml
+++ b/phoenix-queryserver-assembly/pom.xml
@@ -62,6 +62,10 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-1.2-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/phoenix-queryserver-assembly/src/assembly/cluster.xml b/phoenix-queryserver-assembly/src/assembly/cluster.xml
index d0ed572..473669c 100644
--- a/phoenix-queryserver-assembly/src/assembly/cluster.xml
+++ b/phoenix-queryserver-assembly/src/assembly/cluster.xml
@@ -63,6 +63,7 @@
           <include>org.apache.logging.log4j:log4j-api</include>
           <include>org.apache.logging.log4j:log4j-core</include>
           <include>org.apache.logging.log4j:log4j-1.2-api</include>
+          <include>org.slf4j:jcl-over-slf4j</include>
         </includes>
       </dependencySet>
       <dependencySet>
diff --git a/phoenix-queryserver-it/pom.xml b/phoenix-queryserver-it/pom.xml
index 04103bc..6d3f422 100644
--- a/phoenix-queryserver-it/pom.xml
+++ b/phoenix-queryserver-it/pom.xml
@@ -208,6 +208,11 @@
       <artifactId>log4j-slf4j-impl</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-1.2-api</artifactId>
diff --git a/phoenix-queryserver-orchestrator/pom.xml b/phoenix-queryserver-orchestrator/pom.xml
index a383550..8431f50 100644
--- a/phoenix-queryserver-orchestrator/pom.xml
+++ b/phoenix-queryserver-orchestrator/pom.xml
@@ -49,6 +49,8 @@
               org.apache.hbase:hbase-it
             </ignoredUnusedDeclaredDependency>
           </ignoredUnusedDeclaredDependencies>
+          <!-- dependency:analyze is quite useless for hadoop test dependencies -->
+          <ignoreNonCompile>true</ignoreNonCompile>
         </configuration>
       </plugin>
 </plugins>
@@ -59,6 +61,11 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>net.sourceforge.argparse4j</groupId>
             <artifactId>argparse4j</artifactId>
diff --git a/pom.xml b/pom.xml
index 687676f..ef8b697 100644
--- a/pom.xml
+++ b/pom.xml
@@ -761,6 +761,11 @@
                 <artifactId>slf4j-api</artifactId>
                 <version>${slf4j.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>jcl-over-slf4j</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-api</artifactId>
@@ -809,6 +814,10 @@
                         <groupId>org.jruby</groupId>
                         <artifactId>jruby-complete</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>