diff --git a/spring-boot-samples/spring-boot-sample-profile/application.yml b/spring-boot-samples/spring-boot-sample-profile/application.yml
new file mode 100644
index 00000000000..6d4e66da9c4
--- /dev/null
+++ b/spring-boot-samples/spring-boot-sample-profile/application.yml
@@ -0,0 +1 @@
+hello: Bonjour
\ No newline at end of file
diff --git a/spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/GenericService.java b/spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/GenericService.java
new file mode 100644
index 00000000000..83dbced34f2
--- /dev/null
+++ b/spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/GenericService.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2012-2013 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.boot.sample.profile.service;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Component;
+
+@Component
+@Profile({ "generic" })
+public class GenericService implements MessageService {
+
+	@Value("${hello:Hello}")
+	private String hello;
+
+	@Value("${name:World}")
+	private String name;
+
+	@Override
+	public String getMessage() {
+		return this.hello + " " + this.name;
+	}
+
+}
diff --git a/spring-boot-samples/spring-boot-sample-profile/src/test/java/org/springframework/boot/sample/profile/SampleProfileApplicationTests.java b/spring-boot-samples/spring-boot-sample-profile/src/test/java/org/springframework/boot/sample/profile/SampleProfileApplicationTests.java
index 1674e24c64c..8b34c98342c 100644
--- a/spring-boot-samples/spring-boot-sample-profile/src/test/java/org/springframework/boot/sample/profile/SampleProfileApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-profile/src/test/java/org/springframework/boot/sample/profile/SampleProfileApplicationTests.java
@@ -40,8 +40,7 @@ public class SampleProfileApplicationTests {
 	public void after() {
 		if (this.profiles != null) {
 			System.setProperty("spring.profiles.active", this.profiles);
-		}
-		else {
+		} else {
 			System.clearProperty("spring.profiles.active");
 		}
 	}
@@ -61,6 +60,20 @@ public class SampleProfileApplicationTests {
 		assertTrue("Wrong output: " + output, output.contains("Goodbye Everyone"));
 	}
 
+	@Test
+	public void testGenericProfile() throws Exception {
+		/*
+		 * This is a profile that requires a new environment property, and one which is
+		 * only overridden in the current working directory. That file also only contains
+		 * partial overrides, and the default application.yml should still supply the
+		 * "name" property.
+		 */
+		System.setProperty("spring.profiles.active", "generic");
+		SampleProfileApplication.main(new String[0]);
+		String output = this.outputCapture.toString();
+		assertTrue("Wrong output: " + output, output.contains("Bonjour Phil"));
+	}
+
 	@Test
 	public void testGoodbyeProfileFromCommandline() throws Exception {
 		SampleProfileApplication