diff --git a/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java b/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java
index 1cda442eee..8751f27e9a 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java
@@ -212,7 +212,7 @@ public class UriTemplate implements Serializable {
 						String variable = builder.toString();
 						int idx = variable.indexOf(':');
 						if (idx == -1) {
-							pattern.append("(.*)");
+							pattern.append("([^/]*)");
 							variableNames.add(variable);
 						}
 						else {
diff --git a/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java b/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java
index 99c642f06b..aacb193611 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java
@@ -153,9 +153,7 @@ public class UriTemplateTests {
 		assertEquals("Invalid match", expected, result);
 	}
 
-	// SPR-13627
-
-	@Test
+	@Test // SPR-13627
 	public void matchCustomRegexWithNestedCurlyBraces() throws Exception {
 		UriTemplate template = new UriTemplate("/site.{domain:co.[a-z]{2}}");
 		Map<String, String> result = template.match("/site.co.eu");
@@ -180,6 +178,12 @@ public class UriTemplateTests {
 		assertEquals("Invalid match", expected, result);
 	}
 
+	@Test // SPR-16169
+	public void matchWithMultipleSegmentsAtTheEnd() {
+		UriTemplate template = new UriTemplate("/account/{accountId}");
+		assertFalse(template.matches("/account/15/alias/5"));
+	}
+
 	@Test
 	public void queryVariables() throws Exception {
 		UriTemplate template = new UriTemplate("/search?q={query}");
@@ -195,9 +199,7 @@ public class UriTemplateTests {
 		assertTrue(template.matches("/search?query=foo#bar"));
 	}
 
-	// SPR-13705
-
-	@Test
+	@Test // SPR-13705
 	public void matchesWithSlashAtTheEnd() {
 		UriTemplate uriTemplate = new UriTemplate("/test/");
 		assertTrue(uriTemplate.matches("/test/"));