diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudFoundryVcapEnvironmentPostProcessor.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudFoundryVcapEnvironmentPostProcessor.java
index 7fec2ea7b3..8e0497ec28 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudFoundryVcapEnvironmentPostProcessor.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudFoundryVcapEnvironmentPostProcessor.java
@@ -87,6 +87,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Dave Syer
  * @author Andy Wilkinson
+ * @author Madhura Bhave
  * @since 1.3.0
  */
 public class CloudFoundryVcapEnvironmentPostProcessor
@@ -230,10 +231,19 @@ public class CloudFoundryVcapEnvironmentPostProcessor
 		if (key.startsWith("[")) {
 			return path + key;
 		}
-		if (key.contains(".")) {
+		if (shouldWrap(key)) {
 			return path + "[" + key + "]";
 		}
 		return path + "." + key;
 	}
 
+	private boolean shouldWrap(String key) {
+		for (char ch : key.toCharArray()) {
+			if (!Character.isLowerCase(ch) && !Character.isDigit(ch) && ch != '-') {
+				return true;
+			}
+		}
+		return false;
+	}
+
 }
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/cloud/cloudfoundry/CloudFoundryVcapEnvironmentPostProcessorTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/cloud/cloudfoundry/CloudFoundryVcapEnvironmentPostProcessorTests.java
index 3293acf56d..84a35556a9 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/cloud/cloudfoundry/CloudFoundryVcapEnvironmentPostProcessorTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/cloud/cloudfoundry/CloudFoundryVcapEnvironmentPostProcessorTests.java
@@ -30,6 +30,8 @@ import static org.assertj.core.api.Assertions.assertThat;
  *
  * @author Dave Syer
  * @author Andy Wilkinson
+ * @author Hans Schulz
+ * @author Madhura Bhave
  */
 public class CloudFoundryVcapEnvironmentPostProcessorTests {
 
@@ -118,7 +120,7 @@ public class CloudFoundryVcapEnvironmentPostProcessorTests {
 	}
 
 	@Test
-	void testServicePropertiesContainingKeysWithDot() {
+	public void testServicePropertiesContainingKeysWithDot() {
 		TestPropertySourceUtils.addInlinedPropertiesToEnvironment(this.context,
 				"VCAP_SERVICES={\"user-provided\":[{\"name\":\"test\",\"label\":\"test-label\","
 						+ "\"credentials\":{\"key.with.dots\":\"some-value\"}}]}");
@@ -127,6 +129,16 @@ public class CloudFoundryVcapEnvironmentPostProcessorTests {
 		assertThat(getProperty("vcap.services.test.credentials[key.with.dots]")).isEqualTo("some-value");
 	}
 
+	@Test
+	public void testServicePropertiesContainingKeysWithUpperCaseAndNonAlphaNumericCharacters() {
+		TestPropertySourceUtils.addInlinedPropertiesToEnvironment(this.context,
+				"VCAP_SERVICES={\"user-provided\":[{\"name\":\"test\",\"label\":\"test-label\","
+						+ "\"credentials\":{\"My-Key\":\"some-value\", \"foo@\":\"bar\"}}]}");
+		this.initializer.postProcessEnvironment(this.context.getEnvironment(), null);
+		assertThat(getProperty("vcap.services.test.credentials[My-Key]")).isEqualTo("some-value");
+		assertThat(getProperty("vcap.services.test.credentials[foo@]")).isEqualTo("bar");
+	}
+
 	private String getProperty(String key) {
 		return this.context.getEnvironment().getProperty(key);
 	}