diff --git a/docs/src/reference/asciidoc/sm-examples.adoc b/docs/src/reference/asciidoc/sm-examples.adoc
index 97f73609..1f1f557b 100644
--- a/docs/src/reference/asciidoc/sm-examples.adoc
+++ b/docs/src/reference/asciidoc/sm-examples.adoc
@@ -1522,7 +1522,7 @@ Metrics can be viewed from Boot.
 
 [source,json]
 ----
-# curl http://localhost:8080/metrics
+# curl http://localhost:8080/application/metrics
 
 {
 "gauge.ssm.transition.INITIAL_S1.duration":0.0,
@@ -1544,7 +1544,7 @@ Tracing can be viewed from Boot.
 
 [source,json]
 ----
-# curl http://localhost:8080/trace
+# curl http://localhost:8080/application/trace
 
 [{
   "timestamp":1478419121956,
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 6a48dcac..9220a56a 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
@@ -79,7 +79,7 @@ public class MonitoringTests {
 			perform(get("/state").param("events", "E1")).
 			andExpect(status().isOk());
 		mvc.
-			perform(get("/metrics")).
+			perform(get("/application/metrics")).
 			andExpect(jsonPath("$.['counter.ssm.transition.INITIAL_S1.transit']", is(1)));
 	}
 
@@ -89,7 +89,7 @@ public class MonitoringTests {
 			perform(get("/state")).
 			andExpect(status().isOk());
 		mvc.
-			perform(get("/trace")).
+			perform(get("/application/trace")).
 			andExpect(jsonPath("$.*.info.transition", containsInAnyOrder("INITIAL_S1")));
 	}