diff --git a/.gitignore b/.gitignore
index 12927929b..a72e036a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@ target
 .project
 .idea
 *.iml
-/.run
 /logs/
 /venv/
 /contrib/docker-compose-example-elasticsearch/config/idx/_status.json
diff --git a/.run/Template JUnit.run.xml b/.run/Template JUnit.run.xml
new file mode 100644
index 000000000..a7b82d57e
--- /dev/null
+++ b/.run/Template JUnit.run.xml	
@@ -0,0 +1,11 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="true" type="JUnit" factoryName="JUnit">
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="class" />
+    <option name="VM_PARAMETERS" value="-ea -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/cli/pom.xml b/cli/pom.xml
index 4ee7cfe15..71e6f0720 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -38,6 +38,11 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/framework/pom.xml b/framework/pom.xml
index 06f94662f..f23eb4251 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -80,11 +80,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-1.2-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
+            <artifactId>log4j-slf4j2-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
diff --git a/pom.xml b/pom.xml
index a6b2270b9..492899665 100644
--- a/pom.xml
+++ b/pom.xml
@@ -705,7 +705,7 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-slf4j-impl</artifactId>
+                <artifactId>log4j-slf4j2-impl</artifactId>
                 <version>${log4j.version}</version>
                 <optional>true</optional>
             </dependency>
diff --git a/test-framework/pom.xml b/test-framework/pom.xml
index 9b8d6b29b..2d87c704e 100644
--- a/test-framework/pom.xml
+++ b/test-framework/pom.xml
@@ -35,14 +35,6 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-1.2-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-jcl</artifactId>