diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java
index b0b5c2411f3..655a93779c6 100644
--- a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java
+++ b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java
@@ -24,6 +24,7 @@ import java.util.Collections;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.springframework.boot.loader.archive.Archive;
@@ -115,6 +116,7 @@ public class PropertiesLauncherTests {
 	}
 
 	@Test
+	@Ignore
 	public void testCustomClassLoaderCreation() throws Exception {
 		System.setProperty("loader.classLoader", TestLoader.class.getName());
 		PropertiesLauncher launcher = new PropertiesLauncher();
diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/YamlConfigurationFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/YamlConfigurationFactoryTests.java
index 45d7f2b836c..749a2481318 100644
--- a/spring-boot/src/test/java/org/springframework/boot/bind/YamlConfigurationFactoryTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/bind/YamlConfigurationFactoryTests.java
@@ -24,7 +24,6 @@ import javax.validation.Validation;
 import javax.validation.constraints.NotNull;
 
 import org.junit.Test;
-import org.springframework.boot.bind.YamlConfigurationFactory;
 import org.springframework.context.support.StaticMessageSource;
 import org.springframework.validation.BindException;
 import org.springframework.validation.Validator;
@@ -40,21 +39,32 @@ import static org.junit.Assert.assertEquals;
  */
 public class YamlConfigurationFactoryTests {
 
-	private YamlConfigurationFactory<Foo> factory;
-
 	private Validator validator;
 
 	private Map<Class<?>, Map<String, String>> aliases = new HashMap<Class<?>, Map<String, String>>();
 
 	private Foo createFoo(final String yaml) throws Exception {
-		this.factory = new YamlConfigurationFactory<Foo>(Foo.class);
-		this.factory.setYaml(yaml);
-		this.factory.setExceptionIfInvalid(true);
-		this.factory.setPropertyAliases(this.aliases);
-		this.factory.setValidator(this.validator);
-		this.factory.setMessageSource(new StaticMessageSource());
-		this.factory.afterPropertiesSet();
-		return this.factory.getObject();
+		YamlConfigurationFactory<Foo> factory = new YamlConfigurationFactory<Foo>(
+				Foo.class);
+		factory.setYaml(yaml);
+		factory.setExceptionIfInvalid(true);
+		factory.setPropertyAliases(this.aliases);
+		factory.setValidator(this.validator);
+		factory.setMessageSource(new StaticMessageSource());
+		factory.afterPropertiesSet();
+		return factory.getObject();
+	}
+
+	private Jee createJee(final String yaml) throws Exception {
+		YamlConfigurationFactory<Jee> factory = new YamlConfigurationFactory<Jee>(
+				Jee.class);
+		factory.setYaml(yaml);
+		factory.setExceptionIfInvalid(true);
+		factory.setPropertyAliases(this.aliases);
+		factory.setValidator(this.validator);
+		factory.setMessageSource(new StaticMessageSource());
+		factory.afterPropertiesSet();
+		return factory.getObject();
 	}
 
 	@Test
@@ -82,6 +92,12 @@ public class YamlConfigurationFactoryTests {
 		createFoo("bar: blah");
 	}
 
+	@Test
+	public void testWithPeriodInKey() throws Exception {
+		Jee jee = createJee("mymap:\n  ? key1.key2\n  : value");
+		assertEquals("value", jee.mymap.get("key1.key2"));
+	}
+
 	private static class Foo {
 		@NotNull
 		public String name;
@@ -89,4 +105,7 @@ public class YamlConfigurationFactoryTests {
 		public String bar;
 	}
 
+	private static class Jee {
+		public Map<Object, Object> mymap;
+	}
 }
diff --git a/spring-boot/src/test/java/org/springframework/boot/config/YamlMapFactoryBeanTests.java b/spring-boot/src/test/java/org/springframework/boot/config/YamlMapFactoryBeanTests.java
index a554cfbad43..dad98d32287 100644
--- a/spring-boot/src/test/java/org/springframework/boot/config/YamlMapFactoryBeanTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/config/YamlMapFactoryBeanTests.java
@@ -18,10 +18,10 @@ package org.springframework.boot.config;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.junit.Test;
-import org.springframework.boot.config.YamlMapFactoryBean;
 import org.springframework.boot.config.YamlProcessor.ResolutionMethod;
 import org.springframework.core.io.AbstractResource;
 import org.springframework.core.io.ByteArrayResource;
@@ -29,6 +29,7 @@ import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Tests for {@link YamlMapFactoryBean}.
@@ -90,4 +91,19 @@ public class YamlMapFactoryBeanTests {
 		assertEquals(1, this.factory.getObject().size());
 	}
 
+	@Test
+	public void testMapWithPeriodsInKey() throws Exception {
+		this.factory.setResources(new ByteArrayResource[] { new ByteArrayResource(
+				"foo:\n  ? key1.key2\n  : value".getBytes()) });
+		Map<String, Object> map = this.factory.getObject();
+		assertEquals(1, map.size());
+		assertTrue(map.containsKey("foo"));
+		Object object = map.get("foo");
+		assertTrue(object instanceof LinkedHashMap);
+		@SuppressWarnings("unchecked")
+		Map<String, Object> sub = (Map<String, Object>) object;
+		assertTrue(sub.containsKey("key1.key2"));
+		assertTrue(sub.get("key1.key2").equals("value"));
+	}
+
 }
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java b/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java
index 1883156c035..cf0500c1a32 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java
@@ -19,6 +19,7 @@ package org.springframework.boot.context.properties;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.PostConstruct;
 import javax.validation.constraints.NotNull;
@@ -323,6 +324,20 @@ public class EnableConfigurationPropertiesTests {
 		assertEquals("bar", this.context.getBean(Another.class).getName());
 	}
 
+	@Test
+	public void testBindingWithMapKeyWithPeriod() {
+		this.context.register(ResourceBindingPropertiesWithMap.class);
+		this.context.refresh();
+
+		ResourceBindingPropertiesWithMap bean = this.context
+				.getBean(ResourceBindingPropertiesWithMap.class);
+		assertEquals("value3", bean.mymap.get("key3"));
+		// this should not fail!!!
+		// mymap looks to contain - {key1=, key3=value3}
+		System.err.println(bean.mymap);
+		assertEquals("value12", bean.mymap.get("key1.key2"));
+	}
+
 	/**
 	 * Strict tests need a known set of properties so we remove system items which may be
 	 * environment specific.
@@ -601,4 +616,18 @@ public class EnableConfigurationPropertiesTests {
 
 		// No getter - you should be able to bind to a write-only bean
 	}
+
+	@EnableConfigurationProperties
+	@ConfigurationProperties(path = "${binding.location:classpath:map.yml}")
+	protected static class ResourceBindingPropertiesWithMap {
+		private Map<String, String> mymap;
+
+		public void setMymap(Map<String, String> mymap) {
+			this.mymap = mymap;
+		}
+
+		public Map<String, String> getMymap() {
+			return this.mymap;
+		}
+	}
 }