diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml
index c1065c975be..e7709f4597a 100644
--- a/bookkeeper-common/pom.xml
+++ b/bookkeeper-common/pom.xml
@@ -83,16 +83,19 @@
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-1.2-api</artifactId>
       <version>${log4j.version}</version>
+      <scope>test</scope> <!-- There are tests that rely on this binding in their test logic -->
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
       <version>${log4j.version}</version>
+      <scope>test</scope> <!-- There are tests that rely on this binding in their test logic -->
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j-impl</artifactId>
       <version>${log4j.version}</version>
+      <scope>test</scope> <!-- There are tests that rely on this binding in their test logic -->
     </dependency>
   </dependencies>
   <build>
diff --git a/bookkeeper-dist/all/build.gradle b/bookkeeper-dist/all/build.gradle
index 205cdf26d4f..78c4086f1a7 100644
--- a/bookkeeper-dist/all/build.gradle
+++ b/bookkeeper-dist/all/build.gradle
@@ -37,6 +37,8 @@ dependencies {
     implementation project(':bookkeeper-tools')
     implementation depLibs.jsr305
     runtimeOnly depLibs.log4j12api
+    runtimeOnly depLibs.log4jSlf4jImpl
+    runtimeOnly depLibs.log4jCore
     implementation (depLibs.zookeeperTest) {
         exclude group: "io.netty", module: "netty-transport-native-epoll"
         exclude group: 'log4j', module: 'log4j'
diff --git a/bookkeeper-dist/bkctl/build.gradle b/bookkeeper-dist/bkctl/build.gradle
index eda3c96d978..772070d74f9 100644
--- a/bookkeeper-dist/bkctl/build.gradle
+++ b/bookkeeper-dist/bkctl/build.gradle
@@ -36,8 +36,10 @@ dependencies {
     runtimeOnly (project(':bookkeeper-stats-providers:codahale-metrics-provider')) {
        exclude group: "io.dropwizard.metrics", module: "metrics-graphite"
        exclude group: "io.dropwizard.metrics", module: "metrics-jvm"
-   }
+    }
     runtimeOnly depLibs.snappy
+    runtimeOnly depLibs.log4jCore
+    runtimeOnly depLibs.log4jSlf4jImpl
 }
 
 releaseArtifacts {
diff --git a/bookkeeper-dist/server/build.gradle b/bookkeeper-dist/server/build.gradle
index d10add5b587..b240abb8fc3 100644
--- a/bookkeeper-dist/server/build.gradle
+++ b/bookkeeper-dist/server/build.gradle
@@ -35,8 +35,9 @@ dependencies {
     implementation project(':stream:distributedlog:core')
     implementation project(':stream:server')
     implementation project(':bookkeeper-tools')
-    implementation depLibs.log4j12api
-
+    runtimeOnly depLibs.log4j12api
+    runtimeOnly depLibs.log4jSlf4jImpl
+    runtimeOnly depLibs.log4jCore
     runtimeOnly (depLibs.zookeeperTest) {
         exclude group: "io.netty", module: "netty-transport-native-epoll"
         exclude group: 'log4j', module: 'log4j'
diff --git a/bookkeeper-server/build.gradle b/bookkeeper-server/build.gradle
index bdfccc3d69d..aa85d09e75c 100644
--- a/bookkeeper-server/build.gradle
+++ b/bookkeeper-server/build.gradle
@@ -53,9 +53,6 @@ dependencies {
     implementation depLibs.protobuf
     implementation depLibs.rocksDb
     implementation depLibs.zookeeper
-    implementation depLibs.log4jSlf4jImpl
-    implementation depLibs.log4j12api
-    implementation depLibs.log4jCore
     runtimeOnly depLibs.metricsCore
     runtimeOnly depLibs.snappy
 
@@ -77,6 +74,9 @@ dependencies {
     testImplementation depLibs.zookeeperTest
     annotationProcessor depLibs.lombok
     testAnnotationProcessor depLibs.lombok
+    testImplementation depLibs.log4jSlf4jImpl
+    testImplementation depLibs.log4j12api
+    testImplementation depLibs.log4jCore
 }
 
 task writeClasspath {
diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml
index 07004c8770a..469aab161d9 100644
--- a/bookkeeper-server/pom.xml
+++ b/bookkeeper-server/pom.xml
@@ -52,14 +52,20 @@
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-1.2-api</artifactId>
+      <version>${log4j.version}</version>
+      <scope>test</scope> <!-- There are tests that rely on this binding in their test logic -->
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
+      <version>${log4j.version}</version>
+      <scope>test</scope> <!-- There are tests that rely on this binding in their test logic -->
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j-impl</artifactId>
+      <version>${log4j.version}</version>
+      <scope>test</scope> <!-- There are tests that rely on this binding in their test logic -->
     </dependency>
     <dependency>
       <groupId>org.apache.zookeeper</groupId>
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileSystemUpgrade.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileSystemUpgrade.java
index b009eae38ca..c50e05633d8 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileSystemUpgrade.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileSystemUpgrade.java
@@ -52,7 +52,6 @@
 import org.apache.commons.cli.Options;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.io.FileUtils;
-import org.apache.log4j.ConsoleAppender;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -335,13 +334,6 @@ private static void printHelp(Options opts) {
     }
 
     public static void main(String[] args) throws Exception {
-        org.apache.log4j.Logger root = org.apache.log4j.Logger.getRootLogger();
-        ConsoleAppender console = new org.apache.log4j.ConsoleAppender();
-        console.setLayout(new org.apache.log4j.PatternLayout("%-5p [%t]: %m%n"));
-        root.addAppender(console);
-        root.setLevel(org.apache.log4j.Level.ERROR);
-        org.apache.log4j.Logger.getLogger(FileSystemUpgrade.class).setLevel(
-                org.apache.log4j.Level.INFO);
 
         final Options opts = new Options();
         opts.addOption("c", "conf", true, "Configuration for Bookie");
diff --git a/stream/server/build.gradle b/stream/server/build.gradle
index 944277dcd3c..19faa189683 100644
--- a/stream/server/build.gradle
+++ b/stream/server/build.gradle
@@ -59,6 +59,8 @@ dependencies {
     implementation depLibs.metricsCore
     implementation depLibs.snappy
     implementation depLibs.log4j12api
+    implementation depLibs.log4jSlf4jImpl
+    implementation depLibs.log4jCore
     implementation depLibs.vertxCore
     implementation depLibs.vertxWeb
     testImplementation depLibs.mockito