diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryTests.java
index cf32dd31bc..3ace0fb03a 100644
--- a/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryTests.java
@@ -164,6 +164,12 @@ public class PropertiesConfigurationFactoryTests {
 		assertThat(foo.name).isEqualTo("blah");
 	}
 
+	@Test
+	public void propertyWithAllUpperCaseSuffixCanBeBound() throws Exception {
+		Foo foo = createFoo("foo-bar-u-r-i:baz");
+		assertEquals("baz", foo.fooBarURI);
+	}
+
 	private Foo createFoo(final String values) throws Exception {
 		setupFactory();
 		return bindFoo(values);
@@ -196,6 +202,8 @@ public class PropertiesConfigurationFactoryTests {
 
 		private String fooBar;
 
+		private String fooBarURI;
+
 		public String getSpringFooBaz() {
 			return this.spring_foo_baz;
 		}
@@ -228,6 +236,14 @@ public class PropertiesConfigurationFactoryTests {
 			this.fooBar = fooBar;
 		}
 
+		public String getFooBarURI() {
+			return this.fooBarURI;
+		}
+
+		public void setFooBarURI(String fooBarURI) {
+			this.fooBarURI = fooBarURI;
+		}
+
 	}
 
 }