diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/querymethods/derived/TODO.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/querymethods/derived/TODO.java
new file mode 100644
index 000000000..61673e3ec
--- /dev/null
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/querymethods/derived/TODO.java
@@ -0,0 +1,5 @@
+package org.springframework.data.cassandra.test.integration.querymethods.derived;
+
+// TODO
+public class TODO {
+}
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/UserRepositoryIntegrationTestsDelegator.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/UserRepositoryIntegrationTestsDelegator.java
index aa9e06b9e..2d75e5d16 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/UserRepositoryIntegrationTestsDelegator.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/UserRepositoryIntegrationTestsDelegator.java
@@ -29,7 +29,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Matthew T. Adams
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-public class UserRepositoryIntegrationTestsDelegator extends AbstractSpringDataEmbeddedCassandraIntegrationTest {
+public abstract class UserRepositoryIntegrationTestsDelegator extends
+		AbstractSpringDataEmbeddedCassandraIntegrationTest {
 
 	@Autowired
 	protected UserRepository repository;
diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/UserRepositoryXmlConfigIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/UserRepositoryXmlConfigIntegrationTests-context.xml
index 418d3d343..a03322f83 100644
--- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/UserRepositoryXmlConfigIntegrationTests-context.xml
+++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/UserRepositoryXmlConfigIntegrationTests-context.xml
@@ -16,7 +16,7 @@
 		entity-base-packages="org.springframework.data.cassandra.test.integration.repository">
 		<cass:entity
 			class="org.springframework.data.cassandra.test.integration.repository.User">
-			<cass:table name="users_x" />
+			<cass:table name="users" />
 		</cass:entity>
 	</cass:mapping>