diff --git a/common/pom.xml b/common/pom.xml
index 368558c3897..84cd5cda97f 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -132,6 +132,10 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-jul</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-1.2-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
diff --git a/docs/content/Production-Cluster-Configuration.md b/docs/content/Production-Cluster-Configuration.md
index e62fd6e8a75..4cff9e2442d 100644
--- a/docs/content/Production-Cluster-Configuration.md
+++ b/docs/content/Production-Cluster-Configuration.md
@@ -92,6 +92,7 @@ JVM Configuration:
 -XX:+PrintGCTimeStamps
 -Duser.timezone=UTC
 -Dfile.encoding=UTF-8
+-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
 -Djava.io.tmpdir=/mnt/tmp
 ```
 
@@ -147,6 +148,7 @@ JVM Configuration:
 -XX:+PrintGCTimeStamps
 -Duser.timezone=UTC
 -Dfile.encoding=UTF-8
+-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
 -Djava.io.tmpdir=/mnt/tmp
 ```
 
@@ -210,6 +212,7 @@ JVM Configuration:
 -XX:+PrintGCTimeStamps
 -Duser.timezone=UTC
 -Dfile.encoding=UTF-8
+-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
 -Djava.io.tmpdir=/mnt/tmp
 ```
 
@@ -249,6 +252,7 @@ JVM Configuration:
 -XX:+PrintGCTimeStamps
 -Duser.timezone=UTC
 -Dfile.encoding=UTF-8
+-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
 -Djava.io.tmpdir=/mnt/tmp
 ```
 
@@ -301,6 +305,7 @@ JVM Configuration:
 -XX:+PrintGCTimeStamps
 -Duser.timezone=UTC
 -Dfile.encoding=UTF-8
+-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
 -Djava.io.tmpdir=/mnt/tmp
 
 -Dcom.sun.management.jmxremote.port=17071
diff --git a/docs/content/Simple-Cluster-Configuration.md b/docs/content/Simple-Cluster-Configuration.md
index 30559066f87..e209ea6310c 100644
--- a/docs/content/Simple-Cluster-Configuration.md
+++ b/docs/content/Simple-Cluster-Configuration.md
@@ -32,6 +32,7 @@ Configuration:
 -Xmx256m
 -Duser.timezone=UTC
 -Dfile.encoding=UTF-8
+-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
 
 -Ddruid.indexer.queue.startDelay=PT0M
 -Ddruid.indexer.runner.javaOpts="-server -Xmx1g"
@@ -56,6 +57,7 @@ Configuration:
 -Xmx256m
 -Duser.timezone=UTC
 -Dfile.encoding=UTF-8
+-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
 
 druid.coordinator.startDelay=PT70s
 ```
@@ -77,6 +79,7 @@ Configuration:
 -Xmx256m
 -Duser.timezone=UTC
 -Dfile.encoding=UTF-8
+-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
 
 druid.server.maxSize=10000000000
 
@@ -103,6 +106,7 @@ Configuration:
 -Xmx256m
 -Duser.timezone=UTC
 -Dfile.encoding=UTF-8
+-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
 
 druid.processing.buffer.sizeBytes=100000000
 druid.processing.numThreads=1
diff --git a/pom.xml b/pom.xml
index 1c08f0e94cf..33adea93305 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
         <jetty.version>9.2.5.v20141112</jetty.version>
         <druid.api.version>0.3.5</druid.api.version>
         <jackson.version>2.4.4</jackson.version>
-        <log4j.version>2.1</log4j.version>
+        <log4j.version>2.2</log4j.version>
         <slf4j.version>1.7.10</slf4j.version>
     </properties>
 
@@ -611,7 +611,7 @@
                     <artifactId>maven-surefire-plugin</artifactId>
                     <configuration>
                         <!-- locale settings must be set on the command line before startup -->
-                        <argLine>-Duser.language=en -Duser.country=US</argLine>
+                        <argLine>-Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager</argLine>
                         <!-- our tests are very verbose, let's keep the volume down -->
                         <redirectTestOutputToFile>true</redirectTestOutputToFile>
                     </configuration>
diff --git a/server/pom.xml b/server/pom.xml
index 7d6275618b5..dc6bd021986 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -67,6 +67,13 @@
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-framework</artifactId>
+            <!-- We use log4j2 and log4j-1.2-api as a bridge -->
+            <exclusions>
+              <exclusion>
+                <artifactId>log4j</artifactId>
+                <groupId>log4j</groupId>
+              </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.curator</groupId>