diff --git a/src/test/java/org/springframework/data/repository/core/support/DefaultRepositoryInformationUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/DefaultRepositoryInformationUnitTests.java
index 1989b2a6d..abbdcc7bf 100755
--- a/src/test/java/org/springframework/data/repository/core/support/DefaultRepositoryInformationUnitTests.java
+++ b/src/test/java/org/springframework/data/repository/core/support/DefaultRepositoryInformationUnitTests.java
@@ -234,7 +234,7 @@ public class DefaultRepositoryInformationUnitTests {
 				Optional.of(customImplementation.getClass()));
 
 		Method customBaseRepositoryMethod = GenericsSaveRepository.class.getMethod("save", Object.class);
-		assertThat(information.isCustomMethod(customBaseRepositoryMethod), is(true));
+		assertThat(information.isCustomMethod(customBaseRepositoryMethod)).isTrue();
 	}
 
 	@Test // DATACMNS-939
@@ -280,10 +280,10 @@ public class DefaultRepositoryInformationUnitTests {
 		SimpleSaveRepositoryImpl customImplementation = new SimpleSaveRepositoryImpl();
 		RepositoryMetadata metadata = new DefaultRepositoryMetadata(SimpleSaveRepository.class);
 		RepositoryInformation information = new DefaultRepositoryInformation(metadata, RepositoryFactorySupport.class,
-				customImplementation.getClass());
+				Optional.of(customImplementation.getClass()));
 
 		Method customBaseRepositoryMethod = SimpleSaveRepository.class.getMethod("save", Object.class);
-		assertThat(information.isCustomMethod(customBaseRepositoryMethod), is(true));
+		assertThat(information.isCustomMethod(customBaseRepositoryMethod)).isTrue();
 	}
 
 	private static Method getMethodFrom(Class<?> type, String name) {