diff --git a/src/main/java/org/springframework/data/keyvalue/repository/support/KeyValueRepositoryFactoryBean.java b/src/main/java/org/springframework/data/keyvalue/repository/support/KeyValueRepositoryFactoryBean.java
index 5c53a84..4eb898d 100644
--- a/src/main/java/org/springframework/data/keyvalue/repository/support/KeyValueRepositoryFactoryBean.java
+++ b/src/main/java/org/springframework/data/keyvalue/repository/support/KeyValueRepositoryFactoryBean.java
@@ -41,6 +41,15 @@ public class KeyValueRepositoryFactoryBean<T extends Repository<S, ID>, S, ID ex
 	private Class<? extends AbstractQueryCreator<?, ?>> queryCreator;
 	private Class<? extends RepositoryQuery> repositoryQueryType;
 
+	/**
+	 * Creates a new {@link KeyValueRepositoryFactoryBean} for the given repository interface.
+	 * 
+	 * @param repositoryInterface must not be {@literal null}.
+	 */
+	public KeyValueRepositoryFactoryBean(Class<? extends T> repositoryInterface) {
+		super(repositoryInterface);
+	}
+
 	/**
 	 * Configures the {@link KeyValueOperations} to be used for the repositories.
 	 * 
diff --git a/src/test/java/org/springframework/data/keyvalue/repository/support/KeyValueRepositoryFactoryBeanUnitTests.java b/src/test/java/org/springframework/data/keyvalue/repository/support/KeyValueRepositoryFactoryBeanUnitTests.java
index 2d0ea25..82b6697 100644
--- a/src/test/java/org/springframework/data/keyvalue/repository/support/KeyValueRepositoryFactoryBeanUnitTests.java
+++ b/src/test/java/org/springframework/data/keyvalue/repository/support/KeyValueRepositoryFactoryBeanUnitTests.java
@@ -44,7 +44,8 @@ public class KeyValueRepositoryFactoryBeanUnitTests {
 
 	@Before
 	public void setUp() {
-		this.factoryBean = new KeyValueRepositoryFactoryBean<Repository<Object, Serializable>, Object, Serializable>();
+		this.factoryBean = new KeyValueRepositoryFactoryBean<Repository<Object, Serializable>, Object, Serializable>(
+				SampleRepository.class);
 	}
 
 	/**
@@ -95,29 +96,6 @@ public class KeyValueRepositoryFactoryBeanUnitTests {
 		factoryBean.afterPropertiesSet();
 	}
 
-	/**
-	 * @see DATAKV-123
-	 * @see DATAKV-112
-	 */
-	@Test
-	@SuppressWarnings("unchecked")
-	public void initializesConfiguredFactory() {
-
-		Class<? extends AbstractQueryCreator<?, ?>> creatorType = (Class<? extends AbstractQueryCreator<?, ?>>) mock(
-				AbstractQueryCreator.class).getClass();
-		Class<? extends RepositoryQuery> queryType = (Class<? extends RepositoryQuery>) mock(KeyValuePartTreeQuery.class)
-				.getClass();
-
-		factoryBean.setQueryCreator(creatorType);
-		factoryBean.setKeyValueOperations(mock(KeyValueOperations.class));
-		factoryBean.setQueryType(queryType);
-
-		exception.expect(IllegalArgumentException.class);
-		exception.expectMessage("Repository interface");
-
-		factoryBean.afterPropertiesSet();
-	}
-
 	/**
 	 * @see DATAKV-123
 	 */
@@ -144,4 +122,6 @@ public class KeyValueRepositoryFactoryBeanUnitTests {
 	public void rejectsNullQueryType() {
 		factoryBean.setQueryType(null);
 	}
+
+	interface SampleRepository extends Repository<Object, Serializable> {}
 }