diff --git a/gradle.properties b/gradle.properties
index 3cc347de..3cb7d9f7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,3 +28,4 @@ eclipseEmfEcoreVersion=2.11.1-v20150805-0538
 eclipseEmfCommonVersion=2.11.0-v20150805-0538
 jackson2Version=2.8.3
 eclipsePersistenceVersion=2.1.1
+jsonpathVersion=2.0.0
diff --git a/spring-statemachine-samples/build.gradle b/spring-statemachine-samples/build.gradle
index f7d69378..cb13e0c7 100644
--- a/spring-statemachine-samples/build.gradle
+++ b/spring-statemachine-samples/build.gradle
@@ -125,6 +125,9 @@ project('spring-statemachine-samples-monitoring') {
 	dependencies {
 		compile project(":spring-statemachine-boot")
 		compile("org.springframework.boot:spring-boot-starter-thymeleaf:$springBootVersion")
+		compile("org.springframework.boot:spring-boot-starter-security:$springBootVersion")
+		testCompile("com.jayway.jsonpath:json-path:$jsonpathVersion")
+		testCompile("com.jayway.jsonpath:json-path-assert:$jsonpathVersion")
 	}
 }
 
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
new file mode 100644
index 00000000..6a48dcac
--- /dev/null
+++ b/spring-statemachine-samples/monitoring/src/test/java/demo/monitoring/MonitoringTests.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package demo.monitoring;
+
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = { Application.class })
+@WebAppConfiguration
+@DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD)
+public class MonitoringTests {
+
+	private MockMvc mvc;
+
+	@Autowired
+	private WebApplicationContext context;
+
+	@Test
+	public void testHome() throws Exception {
+		mvc.
+			perform(get("/state")).
+			andExpect(status().isOk());
+	}
+
+	@Test
+	public void testSendEventE1() throws Exception {
+		mvc.
+			perform(get("/state").param("events", "E1")).
+			andExpect(status().isOk()).
+			andExpect(content().string(containsString("Exit S1")));
+	}
+
+	@Test
+	public void testSendEventsE1E2() throws Exception {
+		mvc.
+			perform(get("/state").param("events", "E1").param("events", "E2")).
+			andExpect(status().isOk()).
+			andExpect(content().string(allOf(
+						containsString("Exit S1"),
+						containsString("Exit S2"))));
+	}
+
+	@Test
+	public void testMetrics() throws Exception {
+		mvc.
+			perform(get("/state").param("events", "E1")).
+			andExpect(status().isOk());
+		mvc.
+			perform(get("/metrics")).
+			andExpect(jsonPath("$.['counter.ssm.transition.INITIAL_S1.transit']", is(1)));
+	}
+
+	@Test
+	public void testTrace() throws Exception {
+		mvc.
+			perform(get("/state")).
+			andExpect(status().isOk());
+		mvc.
+			perform(get("/trace")).
+			andExpect(jsonPath("$.*.info.transition", containsInAnyOrder("INITIAL_S1")));
+	}
+
+	@Before
+	public void setup() throws Exception {
+		mvc = MockMvcBuilders.webAppContextSetup(context).build();
+	}
+}