diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/ApplicationContextRegistry.java b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/ApplicationContextRegistry.java
index 3a743b7f0d7a5..4b4d8610cb4e1 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/ApplicationContextRegistry.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/ApplicationContextRegistry.java
@@ -22,6 +22,7 @@
 
 import org.apache.camel.NoSuchBeanException;
 import org.apache.camel.spi.Registry;
+import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.BeanNotOfRequiredTypeException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.context.ApplicationContext;
@@ -75,13 +76,13 @@ public Object lookupByName(String name) {
 
     @Override
     public <T> Set<T> findByType(Class<T> type) {
-        Map<String, T> map = applicationContext.getBeansOfType(type);
+        Map<String, T> map = findByTypeWithName(type);
         return new HashSet<T>(map.values());
     }
 
     @Override
     public <T> Map<String, T> findByTypeWithName(Class<T> type) {
-        return applicationContext.getBeansOfType(type);
+        return BeanFactoryUtils.beansOfTypeIncludingAncestors(applicationContext, type);
     }
 
     @Override
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/spi/ParentContextRegistryTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/spi/ParentContextRegistryTest.java
new file mode 100644
index 0000000000000..c984bfdeb23fb
--- /dev/null
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/spi/ParentContextRegistryTest.java
@@ -0,0 +1,55 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.apache.camel.spring.spi;
+
+import org.apache.camel.spring.SpringTestSupport;
+import org.junit.Assert;
+import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+import java.util.Collections;
+import java.util.List;
+
+public class ParentContextRegistryTest extends SpringTestSupport {
+    private static final List<String> expectedBean = Collections.singletonList("TestValue");
+    @Override
+    protected AbstractXmlApplicationContext createApplicationContext() {
+        ClassPathXmlApplicationContext parentContext = new ClassPathXmlApplicationContext(
+                "parentContextRegistryTestParent.xml", ParentContextRegistryTest.class);
+        return new ClassPathXmlApplicationContext(
+                new String[] {"parentContextRegistryTestChild.xml"},
+                ParentContextRegistryTest.class, parentContext
+        );
+    }
+
+    public void testLookupByName() {
+        Assert.assertEquals(expectedBean, context.getRegistry().lookupByName("testParentBean"));
+    }
+
+    public void testLookupByNameAndType() {
+        Assert.assertEquals(expectedBean, context.getRegistry().lookupByNameAndType("testParentBean", List.class));
+    }
+
+    public void testFindByType() {
+        Assert.assertEquals(Collections.singleton(expectedBean), context.getRegistry().findByType(List.class));
+    }
+
+    public void testFindByTypeWithName() {
+        Assert.assertEquals(Collections.singletonMap("testParentBean", expectedBean),
+                context.getRegistry().findByTypeWithName(List.class));
+    }
+}
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/spi/parentContextRegistryTestChild.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/spi/parentContextRegistryTestChild.xml
new file mode 100644
index 0000000000000..4051126aecf01
--- /dev/null
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/spi/parentContextRegistryTestChild.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+    ">
+
+    <camelContext id="camelContext" xmlns="http://camel.apache.org/schema/spring"/>
+</beans>
\ No newline at end of file
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/spi/parentContextRegistryTestParent.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/spi/parentContextRegistryTestParent.xml
new file mode 100644
index 0000000000000..f8171363a78ed
--- /dev/null
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/spi/parentContextRegistryTestParent.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+       ">
+    <util:list id="testParentBean">
+        <value>TestValue</value>
+    </util:list>
+</beans>
\ No newline at end of file