diff --git a/build.gradle b/build.gradle
index c3483843..83de7bbb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
 	ext {
 		log4jVersion = '1.2.17'
-		springBootVersion = '2.0.0.M6'
+		springBootVersion = '2.0.0.M7'
 		eclipsePersistenceVersion = '2.1.1'
 		kryoVersion = '3.0.3'
 		springCloudClusterVersion = '1.0.2.RELEASE'
diff --git a/spring-statemachine-samples/monitoring/src/main/resources/application.yml b/spring-statemachine-samples/monitoring/src/main/resources/application.yml
index 42c79c3e..a90dc295 100644
--- a/spring-statemachine-samples/monitoring/src/main/resources/application.yml
+++ b/spring-statemachine-samples/monitoring/src/main/resources/application.yml
@@ -9,3 +9,7 @@ endpoints:
   default:
     web:
       enabled: true
+management:
+  endpoints:
+    web:
+      expose: metrics,trace
diff --git a/spring-statemachine-samples/monitoring/src/test/java/demo/monitoring/MonitoringTests.java b/spring-statemachine-samples/monitoring/src/test/java/demo/monitoring/MonitoringTests.java
index d3d765ad..dd722603 100644
--- a/spring-statemachine-samples/monitoring/src/test/java/demo/monitoring/MonitoringTests.java
+++ b/spring-statemachine-samples/monitoring/src/test/java/demo/monitoring/MonitoringTests.java
@@ -82,10 +82,10 @@ public class MonitoringTests {
 			perform(get("/state").param("events", "E1")).
 			andExpect(status().isOk());
 		mvc.
-			perform(get("/application/metrics")).
+			perform(get("/actuator/metrics")).
 			andExpect(jsonPath("$.names", hasItems("ssm.transition.duration", "ssm.transition.transit")));
 		mvc.
-		perform(get("/application/metrics/ssm.transition.transit")).
+		perform(get("/actuator/metrics/ssm.transition.transit")).
 		andDo(print()).
 		andExpect(jsonPath("$.name", is("ssm.transition.transit"))).
 		andExpect(jsonPath("$.measurements[0].value", notNullValue())).
@@ -99,7 +99,7 @@ public class MonitoringTests {
 			perform(get("/state")).
 			andExpect(status().isOk());
 		mvc.
-			perform(get("/application/trace")).
+			perform(get("/actuator/trace")).
 			andExpect(jsonPath("$.traces.*.info.transition", containsInAnyOrder("INITIAL_S1")));
 	}