diff --git a/src/test/java/org/springframework/data/repository/core/support/RepositoryInterfaceAwareBeanPostProcessorIntegrationTests.java b/src/test/java/org/springframework/data/repository/core/support/RepositoryInterfaceAwareBeanPostProcessorIntegrationTests.java
new file mode 100644
index 000000000..b449d7a6f
--- /dev/null
+++ b/src/test/java/org/springframework/data/repository/core/support/RepositoryInterfaceAwareBeanPostProcessorIntegrationTests.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 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.data.repository.core.support;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import java.util.Arrays;
+
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.BeanFactoryUtils;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.core.SpringVersion;
+import org.springframework.data.querydsl.User;
+import org.springframework.data.repository.Repository;
+
+/**
+ * Integration test to make sure Spring Data repository factory beans are found without the factories already
+ * instantiated. Only executed for Spring version newer than 3.2.2.RELEASE.
+ * 
+ * @see SPR-10517
+ * @author Oliver Gierke
+ */
+public class RepositoryInterfaceAwareBeanPostProcessorIntegrationTests {
+
+	static final String LAST_ERROR_VERSION = "3.2.2.RELEASE";
+
+	DefaultListableBeanFactory factory;
+
+	@Before
+	public void setUp() {
+
+		factory = new DefaultListableBeanFactory();
+
+		// Register factory bean for repository
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(DummyRepositoryFactoryBean.class);
+		builder.addPropertyValue("repositoryInterface", UserRepository.class);
+		factory.registerBeanDefinition("repository", builder.getBeanDefinition());
+
+		// Register predicting BeanPostProcessor
+		RepositoryInterfaceAwareBeanPostProcessor processor = new RepositoryInterfaceAwareBeanPostProcessor();
+		processor.setBeanFactory(factory);
+		factory.addBeanPostProcessor(processor);
+	}
+
+	@Test
+	public void lookupBeforeInstantiation() {
+
+		Assume.assumeTrue(isFixedSpringVersion());
+
+		String[] strings = BeanFactoryUtils.beanNamesForTypeIncludingAncestors(factory, RepositoryFactoryInformation.class,
+				false, false);
+		assertThat(Arrays.asList(strings), hasItem("&repository"));
+	}
+
+	@Test
+	public void lookupAfterInstantiation() {
+
+		Assume.assumeTrue(isFixedSpringVersion());
+
+		factory.getBean(UserRepository.class);
+
+		String[] strings = BeanFactoryUtils.beanNamesForTypeIncludingAncestors(factory, RepositoryFactoryInformation.class,
+				false, false);
+		assertThat(Arrays.asList(strings), hasItem("&repository"));
+	}
+
+	private static boolean isFixedSpringVersion() {
+		return SpringVersion.getVersion().compareTo(LAST_ERROR_VERSION) == 1;
+	}
+
+	interface UserRepository extends Repository<User, Long> {
+
+	}
+}