diff --git a/build.gradle b/build.gradle
index ca4b4333..39f26a6a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
 	ext {
 		log4jVersion = '1.2.17'
-		springBootVersion = '2.0.3.RELEASE'
+		springBootVersion = '2.1.0.RELEASE'
 		eclipsePersistenceVersion = '2.1.1'
 		kryoVersion = '3.0.3'
 		springCloudClusterVersion = '1.0.2.RELEASE'
@@ -661,7 +661,7 @@ configure(rootProject) {
 
 	task wrapper(type: Wrapper) {
 		description = 'Generates gradlew[.bat] scripts'
-		gradleVersion = '4.1'
+		gradleVersion = '4.4.1'
 	}
 
 }
diff --git a/gradle.properties b/gradle.properties
index 3bee1c14..331739fb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1 @@
-version=2.0.4.BUILD-SNAPSHOT
+version=2.1.0.BUILD-SNAPSHOT
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7a3265ee..99340b4a 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f16d2666..2c2bbe5f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip
diff --git a/spring-statemachine-samples/eventservice/src/test/java/demo/eventservice/EventServiceTests.java b/spring-statemachine-samples/eventservice/src/test/java/demo/eventservice/EventServiceTests.java
index 766042c6..4377a9b4 100644
--- a/spring-statemachine-samples/eventservice/src/test/java/demo/eventservice/EventServiceTests.java
+++ b/spring-statemachine-samples/eventservice/src/test/java/demo/eventservice/EventServiceTests.java
@@ -46,7 +46,8 @@ import demo.eventservice.StateMachineConfig.Events;
 import demo.eventservice.StateMachineConfig.States;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = { Application.class, Config.class })
+@SpringBootTest(classes = { Application.class,
+		Config.class }, properties = "spring.main.allow-bean-definition-overriding=true")
 @WebAppConfiguration
 @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD)
 public class EventServiceTests {