diff --git a/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactory.java b/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactory.java
index 9a30ac689..da1dc3e9a 100644
--- a/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactory.java
+++ b/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactory.java
@@ -84,7 +84,7 @@ public class JpaRepositoryFactory extends RepositoryFactorySupport {
 			EntityManager entityManager) {
 
 		Class<?> repositoryInterface = metadata.getRepositoryInterface();
-		JpaEntityInformation<?, Serializable> entityInformation = getEntityInformation(metadata.getDomainClass());
+		JpaEntityInformation<?, Serializable> entityInformation = getEntityInformation(metadata.getDomainType());
 
 		SimpleJpaRepository<?, ?> repo = isQueryDslExecutor(repositoryInterface) ? new QueryDslJpaRepository(
 				entityInformation, entityManager) : new SimpleJpaRepository(entityInformation, entityManager);
diff --git a/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepositoryFactory.java b/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepositoryFactory.java
index 8f3896e3a..2155d27a4 100644
--- a/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepositoryFactory.java
+++ b/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepositoryFactory.java
@@ -53,7 +53,7 @@ public class CustomGenericJpaRepositoryFactory extends JpaRepositoryFactory {
 	protected JpaRepository<?, ?> getTargetRepository(RepositoryMetadata metadata, EntityManager em) {
 
 		JpaEntityInformation<Object, Serializable> entityMetadata = mock(JpaEntityInformation.class);
-		when(entityMetadata.getJavaType()).thenReturn((Class<Object>) metadata.getDomainClass());
+		when(entityMetadata.getJavaType()).thenReturn((Class<Object>) metadata.getDomainType());
 		return new CustomGenericJpaRepository<Object, Serializable>(entityMetadata, em);
 	}
 
diff --git a/src/test/java/org/springframework/data/jpa/repository/query/NamedQueryUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/NamedQueryUnitTests.java
index 9096adb65..260a3bafa 100644
--- a/src/test/java/org/springframework/data/jpa/repository/query/NamedQueryUnitTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/query/NamedQueryUnitTests.java
@@ -54,7 +54,7 @@ public class NamedQueryUnitTests {
 	public void setUp() throws SecurityException, NoSuchMethodException {
 
 		method = SampleRepository.class.getMethod("foo", Pageable.class);
-		when(metadata.getDomainClass()).thenReturn((Class) String.class);
+		when(metadata.getDomainType()).thenReturn((Class) String.class);
 		when(metadata.getReturnedDomainClass(method)).thenReturn((Class) String.class);
 	}