diff --git a/cassandra/example/src/test/java/example/springdata/cassandra/udt/UserDefinedTypeIntegrationTest.java b/cassandra/example/src/test/java/example/springdata/cassandra/udt/UserDefinedTypeIntegrationTest.java
index 1d9294d4..96a32f68 100644
--- a/cassandra/example/src/test/java/example/springdata/cassandra/udt/UserDefinedTypeIntegrationTest.java
+++ b/cassandra/example/src/test/java/example/springdata/cassandra/udt/UserDefinedTypeIntegrationTest.java
@@ -17,7 +17,7 @@ package example.springdata.cassandra.udt;
 
 import static org.assertj.core.api.Assertions.*;
 
-import example.springdata.cassandra.util.RequiresCassandraKeyspace;
+import example.springdata.cassandra.util.CassandraKeyspace;
 
 import java.util.Collections;
 
@@ -42,12 +42,13 @@ import com.datastax.driver.core.UserType;
  * Integration test to show User-Defined type support.
  * 
  * @author Mark Paluch
+ * @author Oliver Gierke
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest
 public class UserDefinedTypeIntegrationTest {
 
-	@ClassRule public final static RequiresCassandraKeyspace CASSANDRA_KEYSPACE = RequiresCassandraKeyspace.onLocalhost();
+	@ClassRule public final static CassandraKeyspace CASSANDRA_KEYSPACE = CassandraKeyspace.onLocalhost();
 
 	@Configuration
 	static class Config extends AbstractCassandraConfiguration {
diff --git a/cassandra/java8/README.md b/cassandra/java8/README.md
index 8553efa6..8253681f 100644
--- a/cassandra/java8/README.md
+++ b/cassandra/java8/README.md
@@ -12,9 +12,8 @@ public interface PersonRepository extends CrudRepository<Person, String> {
   @Override
   List<Person> findAll();
 
-  //Custom Query method returning a Java 8 Stream
-  @Query("SELECT * FROM person")
-  Stream<Person> findAllByCustomQueryWithStream();
+  // Derived query method returning a Java 8 Stream
+  Stream<Person> findAll();
 }
 ```
 
diff --git a/cassandra/java8/src/main/java/example/springdata/cassandra/java8/PersonRepository.java b/cassandra/java8/src/main/java/example/springdata/cassandra/java8/PersonRepository.java
index 1bf32c95..57ff2826 100644
--- a/cassandra/java8/src/main/java/example/springdata/cassandra/java8/PersonRepository.java
+++ b/cassandra/java8/src/main/java/example/springdata/cassandra/java8/PersonRepository.java
@@ -37,8 +37,7 @@ public interface PersonRepository extends Repository<Person, String> {
 	 */
 	Optional<Person> findOne(String id);
 
-	@Query("select * from person")
-	Stream<Person> streamAllPeople();
+	Stream<Person> findAll();
 
 	/**
 	 * Sample method to derive a query from using JDK 8's {@link Optional} as return type.
diff --git a/cassandra/java8/src/test/java/example/springdata/cassandra/java8/Java8IntegrationTests.java b/cassandra/java8/src/test/java/example/springdata/cassandra/java8/Java8IntegrationTests.java
index 3ba3be4f..4a48075c 100644
--- a/cassandra/java8/src/test/java/example/springdata/cassandra/java8/Java8IntegrationTests.java
+++ b/cassandra/java8/src/test/java/example/springdata/cassandra/java8/Java8IntegrationTests.java
@@ -81,7 +81,7 @@ public class Java8IntegrationTests {
 		Person homer = repository.save(new Person("1", "Homer", "Simpson"));
 		Person bart = repository.save(new Person("2", "Bart", "Simpson"));
 
-		try (Stream<Person> stream = repository.streamAllPeople()) {
+		try (Stream<Person> stream = repository.findAll()) {
 			assertThat(stream.collect(Collectors.toList()), hasItems(homer, bart));
 		}
 	}