diff --git a/build.gradle b/build.gradle
index 03d2eac9..7c8b14c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -180,7 +180,7 @@ project('spring-statemachine-core') {
 		testCompile "org.springframework.security:spring-security-config"
 		testCompile "org.springframework.security:spring-security-test"
 		testCompile "javax.servlet:javax.servlet-api"
-		testRuntime "log4j:log4j"
+		testRuntime "org.apache.logging.log4j:log4j-core"
 	}
 }
 
@@ -232,7 +232,7 @@ project('spring-statemachine-kryo') {
 		testCompile "org.hamcrest:hamcrest-core"
 		testCompile "org.hamcrest:hamcrest-library"
 		testCompile "junit:junit"
-		testRuntime "log4j:log4j"
+		testRuntime "org.apache.logging.log4j:log4j-core"
 	}
 }
 
@@ -252,7 +252,7 @@ project('spring-statemachine-zookeeper') {
 		testCompile "org.hamcrest:hamcrest-core"
 		testCompile "org.hamcrest:hamcrest-library"
 		testCompile "junit:junit"
-		testRuntime "log4j:log4j"
+		testRuntime "org.apache.logging.log4j:log4j-core"
 	}
 }
 
@@ -270,7 +270,7 @@ project('spring-statemachine-redis') {
 		testCompile "org.hamcrest:hamcrest-core"
 		testCompile "org.hamcrest:hamcrest-library"
 		testCompile "junit:junit"
-		testRuntime "log4j:log4j"
+		testRuntime "org.apache.logging.log4j:log4j-core"
 	}
 }
 
@@ -310,7 +310,7 @@ project('spring-statemachine-cluster') {
 		testCompile "org.hamcrest:hamcrest-core"
 		testCompile "org.hamcrest:hamcrest-library"
 		testCompile "junit:junit"
-		testRuntime "log4j:log4j"
+		testRuntime "org.apache.logging.log4j:log4j-core"
 	}
 }
 
@@ -347,7 +347,7 @@ project('spring-statemachine-uml') {
 		testCompile "org.hamcrest:hamcrest-core"
 		testCompile "org.hamcrest:hamcrest-library"
 		testCompile "junit:junit"
-		testRuntime "log4j:log4j"
+		testRuntime "org.apache.logging.log4j:log4j-core"
 	}
 }
 
diff --git a/spring-statemachine-core/src/test/resources/log4j.properties b/spring-statemachine-core/src/test/resources/log4j.properties
deleted file mode 100644
index c7fdcd54..00000000
--- a/spring-statemachine-core/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-log4j.rootCategory=INFO, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{2} [%t] - %m%n
-
-log4j.category.org.springframework.statemachine=DEBUG
-
diff --git a/spring-statemachine-core/src/test/resources/log4j2.xml b/spring-statemachine-core/src/test/resources/log4j2.xml
new file mode 100644
index 00000000..9c440f57
--- /dev/null
+++ b/spring-statemachine-core/src/test/resources/log4j2.xml
@@ -0,0 +1,13 @@
+<Configuration>
+		<Appenders>
+				<Console name="STDOUT" target="SYSTEM_OUT">
+						<PatternLayout pattern="%d{ABSOLUTE} %5p %t %c{2} [%t] - %m%n"/>
+				</Console>
+		</Appenders>
+		<Loggers>
+				<Logger name="org.springframework.statemachine" level="debug"/>
+				<Root level="info">
+						<AppenderRef ref="STDOUT"/>
+				</Root>
+		</Loggers>
+</Configuration>
diff --git a/spring-statemachine-recipes/src/test/resources/log4j.properties b/spring-statemachine-recipes/src/test/resources/log4j.properties
deleted file mode 100644
index c7fdcd54..00000000
--- a/spring-statemachine-recipes/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-log4j.rootCategory=INFO, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{2} [%t] - %m%n
-
-log4j.category.org.springframework.statemachine=DEBUG
-
diff --git a/spring-statemachine-recipes/src/test/resources/log4j2.xml b/spring-statemachine-recipes/src/test/resources/log4j2.xml
new file mode 100644
index 00000000..9c440f57
--- /dev/null
+++ b/spring-statemachine-recipes/src/test/resources/log4j2.xml
@@ -0,0 +1,13 @@
+<Configuration>
+		<Appenders>
+				<Console name="STDOUT" target="SYSTEM_OUT">
+						<PatternLayout pattern="%d{ABSOLUTE} %5p %t %c{2} [%t] - %m%n"/>
+				</Console>
+		</Appenders>
+		<Loggers>
+				<Logger name="org.springframework.statemachine" level="debug"/>
+				<Root level="info">
+						<AppenderRef ref="STDOUT"/>
+				</Root>
+		</Loggers>
+</Configuration>
diff --git a/spring-statemachine-samples/cdplayer/src/test/resources/log4j.properties b/spring-statemachine-samples/cdplayer/src/test/resources/log4j.properties
deleted file mode 100644
index 4589b1e9..00000000
--- a/spring-statemachine-samples/cdplayer/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-log4j.rootCategory=INFO, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{2} [%t] - %m%n
-
-log4j.category.org.springframework.statemachine=TRACE
-
diff --git a/spring-statemachine-samples/cdplayer/src/test/resources/log4j2.xml b/spring-statemachine-samples/cdplayer/src/test/resources/log4j2.xml
new file mode 100644
index 00000000..9c440f57
--- /dev/null
+++ b/spring-statemachine-samples/cdplayer/src/test/resources/log4j2.xml
@@ -0,0 +1,13 @@
+<Configuration>
+		<Appenders>
+				<Console name="STDOUT" target="SYSTEM_OUT">
+						<PatternLayout pattern="%d{ABSOLUTE} %5p %t %c{2} [%t] - %m%n"/>
+				</Console>
+		</Appenders>
+		<Loggers>
+				<Logger name="org.springframework.statemachine" level="debug"/>
+				<Root level="info">
+						<AppenderRef ref="STDOUT"/>
+				</Root>
+		</Loggers>
+</Configuration>
diff --git a/spring-statemachine-samples/tasks/src/test/resources/log4j.properties b/spring-statemachine-samples/tasks/src/test/resources/log4j.properties
deleted file mode 100644
index 4589b1e9..00000000
--- a/spring-statemachine-samples/tasks/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-log4j.rootCategory=INFO, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{2} [%t] - %m%n
-
-log4j.category.org.springframework.statemachine=TRACE
-
diff --git a/spring-statemachine-samples/tasks/src/test/resources/log4j2.xml b/spring-statemachine-samples/tasks/src/test/resources/log4j2.xml
new file mode 100644
index 00000000..9c440f57
--- /dev/null
+++ b/spring-statemachine-samples/tasks/src/test/resources/log4j2.xml
@@ -0,0 +1,13 @@
+<Configuration>
+		<Appenders>
+				<Console name="STDOUT" target="SYSTEM_OUT">
+						<PatternLayout pattern="%d{ABSOLUTE} %5p %t %c{2} [%t] - %m%n"/>
+				</Console>
+		</Appenders>
+		<Loggers>
+				<Logger name="org.springframework.statemachine" level="debug"/>
+				<Root level="info">
+						<AppenderRef ref="STDOUT"/>
+				</Root>
+		</Loggers>
+</Configuration>
diff --git a/spring-statemachine-zookeeper/src/test/resources/log4j.properties b/spring-statemachine-zookeeper/src/test/resources/log4j.properties
deleted file mode 100644
index 4589b1e9..00000000
--- a/spring-statemachine-zookeeper/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-log4j.rootCategory=INFO, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{2} [%t] - %m%n
-
-log4j.category.org.springframework.statemachine=TRACE
-
diff --git a/spring-statemachine-zookeeper/src/test/resources/log4j2.xml b/spring-statemachine-zookeeper/src/test/resources/log4j2.xml
new file mode 100644
index 00000000..9c440f57
--- /dev/null
+++ b/spring-statemachine-zookeeper/src/test/resources/log4j2.xml
@@ -0,0 +1,13 @@
+<Configuration>
+		<Appenders>
+				<Console name="STDOUT" target="SYSTEM_OUT">
+						<PatternLayout pattern="%d{ABSOLUTE} %5p %t %c{2} [%t] - %m%n"/>
+				</Console>
+		</Appenders>
+		<Loggers>
+				<Logger name="org.springframework.statemachine" level="debug"/>
+				<Root level="info">
+						<AppenderRef ref="STDOUT"/>
+				</Root>
+		</Loggers>
+</Configuration>