diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/org/springframework/boot/sample/ui/MessageControllerWebTest.java b/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/org/springframework/boot/sample/ui/MessageControllerWebTest.java
deleted file mode 100644
index e8840027cf4..00000000000
--- a/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/org/springframework/boot/sample/ui/MessageControllerWebTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.springframework.boot.sample.ui;
-
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-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;
-
-import static org.hamcrest.Matchers.*;
-
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
-
-/**
- * A Basic Spring MVC Test for the Sample Controller"
- * 
- * @author Biju Kunjummen
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@WebAppConfiguration
-@ContextConfiguration(classes = SampleWebUiApplication.class)
-public class MessageControllerWebTest {
-	@Autowired
-	private WebApplicationContext wac;
-
-	private MockMvc mockMvc;
-
-	@Before
-	public void setup() {
-		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
-	}
-
-	@Test
-	public void testHome() throws Exception {
-		this.mockMvc
-			.perform(get("/"))
-			.andExpect(status().isOk())
-			.andExpect(content().string(containsString("<title>Messages")));
-	}
-	
-	@Test
-	public void testCreate() throws Exception {
-		this.mockMvc
-			.perform(post("/").param("text", "FOO text").param("summary", "FOO"))
-			.andExpect(status().isMovedTemporarily())
-			.andExpect(header().string("location", "/1"));
-	}
-
-}
diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/org/springframework/boot/sample/ui/MessageControllerWebTests.java b/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/org/springframework/boot/sample/ui/MessageControllerWebTests.java
new file mode 100644
index 00000000000..ce2c57748bf
--- /dev/null
+++ b/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/org/springframework/boot/sample/ui/MessageControllerWebTests.java
@@ -0,0 +1,84 @@
+package org.springframework.boot.sample.ui;
+
+import java.util.regex.Pattern;
+
+import org.hamcrest.Description;
+import org.hamcrest.TypeSafeMatcher;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+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;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+/**
+ * A Basic Spring MVC Test for the Sample Controller"
+ * 
+ * @author Biju Kunjummen
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+@ContextConfiguration(classes = SampleWebUiApplication.class)
+public class MessageControllerWebTests {
+	@Autowired
+	private WebApplicationContext wac;
+
+	private MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	}
+
+	@Test
+	public void testHome() throws Exception {
+		this.mockMvc.perform(get("/")).andExpect(status().isOk())
+				.andExpect(content().string(containsString("<title>Messages")));
+	}
+
+	@Test
+	public void testCreate() throws Exception {
+		this.mockMvc.perform(post("/").param("text", "FOO text").param("summary", "FOO"))
+				.andExpect(status().isMovedTemporarily())
+				.andExpect(header().string("location", RegexMatcher.matches("/[0-9]+")));
+	}
+
+	private static class RegexMatcher extends TypeSafeMatcher<String> {
+		private final String regex;
+
+		public RegexMatcher(String regex) {
+			this.regex = regex;
+		}
+
+		public static org.hamcrest.Matcher<java.lang.String> matches(String regex) {
+			return new RegexMatcher(regex);
+		}
+
+		@Override
+		public boolean matchesSafely(String item) {
+			return Pattern.compile(this.regex).matcher(item).find();
+		}
+
+		@Override
+		public void describeMismatchSafely(String item, Description mismatchDescription) {
+			mismatchDescription.appendText("was \"").appendText(item).appendText("\"");
+		}
+
+		@Override
+		public void describeTo(Description description) {
+			description.appendText("a string that matches regex: ")
+					.appendText(this.regex);
+		}
+	}
+}