diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/MessageSourceConfigurationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/MessageSourceConfigurationTests.java
new file mode 100644
index 00000000..25e95768
--- /dev/null
+++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/MessageSourceConfigurationTests.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.bootstrap;
+
+/**
+ * @author Dave Syer
+ *
+ */
+
+import java.util.Locale;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.IntegrationTest;
+import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.cloud.bootstrap.MessageSourceConfigurationTests.TestApplication;
+import org.springframework.context.MessageSource;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringApplicationConfiguration(classes = TestApplication.class)
+@IntegrationTest("debug=true")
+public class MessageSourceConfigurationTests {
+
+	@Autowired
+	private MessageSource messageSource;
+
+	@Test
+	public void loadsMessage() {
+		Assert.assertEquals("Hello World!", this.messageSource.getMessage("hello.message", null, Locale.getDefault()));
+	}
+
+	@Configuration
+	@EnableAutoConfiguration
+	protected static class TestApplication {
+
+	}
+
+}
\ No newline at end of file
diff --git a/spring-cloud-context/src/test/resources/messages.properties b/spring-cloud-context/src/test/resources/messages.properties
new file mode 100644
index 00000000..16f361eb
--- /dev/null
+++ b/spring-cloud-context/src/test/resources/messages.properties
@@ -0,0 +1 @@
+hello.message=Hello World!
\ No newline at end of file