diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpoints.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpoints.java
index 7880a44ba6..84b3e4e939 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpoints.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpoints.java
@@ -21,6 +21,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.boot.actuate.endpoint.Endpoint;
 import org.springframework.context.ApplicationContext;
@@ -56,8 +57,8 @@ public class MvcEndpoints implements ApplicationContextAware, InitializingBean {
 		this.endpoints.addAll(existing);
 		this.customTypes = findEndpointClasses(existing);
 		@SuppressWarnings("rawtypes")
-		Collection<Endpoint> delegates = this.applicationContext.getBeansOfType(
-				Endpoint.class).values();
+		Collection<Endpoint> delegates = BeanFactoryUtils.beansOfTypeIncludingAncestors(
+				this.applicationContext, Endpoint.class).values();
 		for (Endpoint<?> endpoint : delegates) {
 			if (isGenericEndpoint(endpoint.getClass())) {
 				this.endpoints.add(new EndpointMvcAdapter(endpoint));
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointsTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointsTests.java
new file mode 100644
index 0000000000..cb9c64aab7
--- /dev/null
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointsTests.java
@@ -0,0 +1,74 @@
+/*
+ * 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.actuate.endpoint.mvc;
+
+import org.junit.Test;
+import org.springframework.boot.actuate.endpoint.AbstractEndpoint;
+import org.springframework.context.support.StaticApplicationContext;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Dave Syer
+ */
+public class MvcEndpointsTests {
+
+	private MvcEndpoints endpoints = new MvcEndpoints();
+	private StaticApplicationContext context = new StaticApplicationContext();
+
+	@Test
+	public void picksUpEndpointDelegates() throws Exception {
+		this.context.getDefaultListableBeanFactory().registerSingleton("endpoint",
+				new TestEndpoint());
+		this.endpoints.setApplicationContext(this.context);
+		this.endpoints.afterPropertiesSet();
+		assertEquals(1, this.endpoints.getEndpoints().size());
+	}
+
+	@Test
+	public void picksUpEndpointDelegatesFromParent() throws Exception {
+		StaticApplicationContext parent = new StaticApplicationContext();
+		this.context.setParent(parent);
+		parent.getDefaultListableBeanFactory().registerSingleton("endpoint",
+				new TestEndpoint());
+		this.endpoints.setApplicationContext(this.context);
+		this.endpoints.afterPropertiesSet();
+		assertEquals(1, this.endpoints.getEndpoints().size());
+	}
+
+	@Test
+	public void picksUpMvcEndpoints() throws Exception {
+		this.context.getDefaultListableBeanFactory().registerSingleton("endpoint",
+				new EndpointMvcAdapter(new TestEndpoint()));
+		this.endpoints.setApplicationContext(this.context);
+		this.endpoints.afterPropertiesSet();
+		assertEquals(1, this.endpoints.getEndpoints().size());
+	}
+
+	protected static class TestEndpoint extends AbstractEndpoint<String> {
+
+		public TestEndpoint() {
+			super("test");
+		}
+
+		@Override
+		public String invoke() {
+			return "foo";
+		}
+	}
+
+}