diff --git a/pom.xml b/pom.xml
index 6d3ec2382..b4791011c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -495,7 +495,7 @@
 					<includes>
 						<include>**/*Tests.java</include>
 					</includes>
-					<argLine>-javaagent:${settings.localRepository}/org/springframework/spring-instrument/3.1.0.RELEASE/spring-instrument-3.1.0.RELEASE.jar -javaagent:${settings.localRepository}/org/apache/openjpa/openjpa/${openjpa.version}/openjpa-${openjpa.version}.jar</argLine>
+					<argLine>-javaagent:${settings.localRepository}/org/springframework/spring-instrument/3.1.1.RELEASE/spring-instrument-3.1.1.RELEASE.jar -javaagent:${settings.localRepository}/org/apache/openjpa/openjpa/${openjpa.version}/openjpa-${openjpa.version}.jar</argLine>
 				</configuration>
 				<dependencies>
 					<dependency>
diff --git a/src/test/java/org/springframework/data/jpa/repository/SPR8954.java b/src/test/java/org/springframework/data/jpa/repository/SPR8954.java
new file mode 100644
index 000000000..d9363727e
--- /dev/null
+++ b/src/test/java/org/springframework/data/jpa/repository/SPR8954.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2012 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.jpa.repository;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.data.jpa.repository.sample.UserRepository;
+import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean;
+import org.springframework.data.repository.core.support.RepositoryFactoryInformation;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("classpath:config/namespace-application-context.xml")
+public class SPR8954 {
+
+	@Autowired
+	ApplicationContext context;
+
+	@Test
+	@SuppressWarnings("rawtypes")
+	public void canAccessRepositoryFactoryInformationFactoryBeans() {
+
+		Map<String, RepositoryFactoryInformation> repoFactories = context
+				.getBeansOfType(RepositoryFactoryInformation.class);
+
+		assertThat(repoFactories.size(), is(greaterThan(0)));
+		assertThat(repoFactories.keySet(), hasItem("&userRepository"));
+		assertThat(repoFactories.get("&userRepository"), is(JpaRepositoryFactoryBean.class));
+		assertThat(Arrays.asList(context.getBeanNamesForType(UserRepository.class)), hasItem("userRepository"));
+	}
+}