diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationTests.java
index d0378941d25..e5b5e2d5140 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationTests.java
@@ -18,9 +18,12 @@ package org.springframework.boot.autoconfigure;
 
 import java.util.Locale;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.boot.test.EnvironmentTestUtils;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
 
 import static org.junit.Assert.assertEquals;
 
@@ -81,4 +84,20 @@ public class MessageSourceAutoConfigurationTests {
 		assertEquals("blah", this.context.getMessage("foo", null, "blah", Locale.UK));
 	}
 
+	@Test
+	@Ignore("Expected to fail per gh-1075")
+	public void testMessageSourceFromPropertySourceAnnotation() throws Exception {
+		this.context = new AnnotationConfigApplicationContext();
+		this.context.register(Config.class, MessageSourceAutoConfiguration.class,
+				PropertyPlaceholderAutoConfiguration.class);
+		this.context.refresh();
+		assertEquals("bar",
+				this.context.getMessage("foo", null, "Foo message", Locale.UK));
+	}
+
+	@Configuration
+	@PropertySource("classpath:/switch-messages.properties")
+	protected static class Config {
+
+	}
 }
diff --git a/spring-boot-autoconfigure/src/test/resources/switch-messages.properties b/spring-boot-autoconfigure/src/test/resources/switch-messages.properties
new file mode 100644
index 00000000000..4a1b10cca76
--- /dev/null
+++ b/spring-boot-autoconfigure/src/test/resources/switch-messages.properties
@@ -0,0 +1 @@
+spring.messages.basename:test/messages
\ No newline at end of file