diff --git a/src/main/java/org/springframework/data/repository/query/QueryMethod.java b/src/main/java/org/springframework/data/repository/query/QueryMethod.java
index 1d7d6c99e..9b8f8eb34 100644
--- a/src/main/java/org/springframework/data/repository/query/QueryMethod.java
+++ b/src/main/java/org/springframework/data/repository/query/QueryMethod.java
@@ -91,8 +91,8 @@ public class QueryMethod {
 			}
 		}
 
-		Assert.notNull(this.parameters, () ->
-				String.format("Parameters extracted from method '%s' must not be null!", method.getName()));
+		Assert.notNull(this.parameters,
+				() -> String.format("Parameters extracted from method '%s' must not be null!", method.getName()));
 
 		if (isPageQuery()) {
 			Assert.isTrue(this.parameters.hasPageableParameter(),
@@ -280,7 +280,7 @@ public class QueryMethod {
 		Assert.notEmpty(types, "Types must not be null or empty!");
 
 		TypeInformation<?> returnType = ClassTypeInformation.fromReturnTypeOf(method);
-		returnType = QueryExecutionConverters.isSingleValue(returnType.getType()) ? returnType.getComponentType()
+		returnType = QueryExecutionConverters.isSingleValue(returnType.getType()) ? returnType.getRequiredComponentType()
 				: returnType;
 
 		for (Class<?> type : types) {
diff --git a/src/test/java/org/springframework/data/repository/config/RepositoryBeanDefinitionRegistrarSupportIntegrationTests.java b/src/test/java/org/springframework/data/repository/config/RepositoryBeanDefinitionRegistrarSupportIntegrationTests.java
index bc5f7df53..f1926e306 100755
--- a/src/test/java/org/springframework/data/repository/config/RepositoryBeanDefinitionRegistrarSupportIntegrationTests.java
+++ b/src/test/java/org/springframework/data/repository/config/RepositoryBeanDefinitionRegistrarSupportIntegrationTests.java
@@ -63,7 +63,8 @@ public class RepositoryBeanDefinitionRegistrarSupportIntegrationTests {
 
 	@Test // DATACMNS-989
 	public void duplicateImplementationsMayBeExcludedViaFilters() {
-		assertThat(context.getBean(MyOtherRepository.class).getImplementationId(), is(MyOtherRepositoryImpl.class.getName()));
+		assertThat(context.getBean(MyOtherRepository.class).getImplementationId())
+				.isEqualTo(MyOtherRepositoryImpl.class.getName());
 	}
 
 	@Test // DATACMNS-47
diff --git a/src/test/java/org/springframework/data/repository/query/QueryMethodUnitTests.java b/src/test/java/org/springframework/data/repository/query/QueryMethodUnitTests.java
index 127406c8c..32f7c2b31 100755
--- a/src/test/java/org/springframework/data/repository/query/QueryMethodUnitTests.java
+++ b/src/test/java/org/springframework/data/repository/query/QueryMethodUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 the original author or authors.
+ * Copyright 2008-2017 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.
@@ -194,7 +194,7 @@ public class QueryMethodUnitTests {
 		RepositoryMetadata repositoryMetadata = new DefaultRepositoryMetadata(SampleRepository.class);
 		Method method = SampleRepository.class.getMethod("returnsSeq");
 
-		assertThat(new QueryMethod(method, repositoryMetadata, factory).isCollectionQuery(), is(true));
+		assertThat(new QueryMethod(method, repositoryMetadata, factory).isCollectionQuery()).isTrue();
 	}
 
 	/**
@@ -206,7 +206,7 @@ public class QueryMethodUnitTests {
 		RepositoryMetadata repositoryMetadata = new DefaultRepositoryMetadata(SampleRepository.class);
 		Method method = SampleRepository.class.getMethod("returnsFutureOfSeq");
 
-		assertThat(new QueryMethod(method, repositoryMetadata, factory).isCollectionQuery(), is(true));
+		assertThat(new QueryMethod(method, repositoryMetadata, factory).isCollectionQuery()).isTrue();
 	}
 
 	/**
@@ -218,7 +218,7 @@ public class QueryMethodUnitTests {
 		RepositoryMetadata repositoryMetadata = new DefaultRepositoryMetadata(SampleRepository.class);
 		Method method = SampleRepository.class.getMethod("returnsFutureOfOption");
 
-		assertThat(new QueryMethod(method, repositoryMetadata, factory).isCollectionQuery(), is(false));
+		assertThat(new QueryMethod(method, repositoryMetadata, factory).isCollectionQuery()).isFalse();
 	}
 
 	@Test // DATACMNS-1005
@@ -227,7 +227,7 @@ public class QueryMethodUnitTests {
 		RepositoryMetadata repositoryMetadata = new DefaultRepositoryMetadata(SampleRepository.class);
 		Method method = SampleRepository.class.getMethod("returnsSeq", Pageable.class);
 
-		assertThat(new QueryMethod(method, repositoryMetadata, factory).isCollectionQuery(), is(true));
+		assertThat(new QueryMethod(method, repositoryMetadata, factory).isCollectionQuery()).isTrue();
 	}
 
 	interface SampleRepository extends Repository<User, Serializable> {