diff --git a/src/test/java/org/springframework/data/projection/ProjectionIntegrationTests.java b/src/test/java/org/springframework/data/projection/ProjectionIntegrationTests.java
old mode 100644
new mode 100755
index 0bea30085..a20325dc1
--- a/src/test/java/org/springframework/data/projection/ProjectionIntegrationTests.java
+++ b/src/test/java/org/springframework/data/projection/ProjectionIntegrationTests.java
@@ -15,8 +15,7 @@
  */
 package org.springframework.data.projection;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.assertj.core.api.Assertions.*;
 
 import org.junit.Test;
 
@@ -43,7 +42,7 @@ public class ProjectionIntegrationTests {
 		ParseContext context = JsonPath.using(new ConfigurationBuilder().options(Option.SUPPRESS_EXCEPTIONS).build());
 		DocumentContext json = context.parse(new ObjectMapper().writeValueAsString(projection));
 
-		assertThat(json.read("$.decoratedClass", String.class), is(nullValue()));
+		assertThat(json.read("$.decoratedClass", String.class)).isNull();
 	}
 
 	interface SampleProjection {
diff --git a/src/test/java/org/springframework/data/web/ProxyingHandlerMethodArgumentResolverUnitTests.java b/src/test/java/org/springframework/data/web/ProxyingHandlerMethodArgumentResolverUnitTests.java
old mode 100644
new mode 100755
index 276e43c8b..79da290ee
--- a/src/test/java/org/springframework/data/web/ProxyingHandlerMethodArgumentResolverUnitTests.java
+++ b/src/test/java/org/springframework/data/web/ProxyingHandlerMethodArgumentResolverUnitTests.java
@@ -15,8 +15,7 @@
  */
 package org.springframework.data.web;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.assertj.core.api.Assertions.*;
 
 import java.lang.reflect.Method;
 import java.util.List;
@@ -44,7 +43,7 @@ public class ProxyingHandlerMethodArgumentResolverUnitTests {
 		Method method = Controller.class.getMethod("with", AnnotatedInterface.class);
 		MethodParameter parameter = new MethodParameter(method, 0);
 
-		assertThat(resolver.supportsParameter(parameter), is(true));
+		assertThat(resolver.supportsParameter(parameter)).isTrue();
 	}
 
 	@Test // DATACMNS-776
@@ -53,7 +52,7 @@ public class ProxyingHandlerMethodArgumentResolverUnitTests {
 		Method method = Controller.class.getMethod("with", SampleInterface.class);
 		MethodParameter parameter = new MethodParameter(method, 0);
 
-		assertThat(resolver.supportsParameter(parameter), is(true));
+		assertThat(resolver.supportsParameter(parameter)).isTrue();
 	}
 
 	@Test // DATACMNS-776
@@ -62,7 +61,7 @@ public class ProxyingHandlerMethodArgumentResolverUnitTests {
 		Method method = Controller.class.getMethod("with", UnannotatedInterface.class);
 		MethodParameter parameter = new MethodParameter(method, 0);
 
-		assertThat(resolver.supportsParameter(parameter), is(false));
+		assertThat(resolver.supportsParameter(parameter)).isFalse();
 	}
 
 	@Test // DATACMNS-776
@@ -71,7 +70,7 @@ public class ProxyingHandlerMethodArgumentResolverUnitTests {
 		Method method = Controller.class.getMethod("with", List.class);
 		MethodParameter parameter = new MethodParameter(method, 0);
 
-		assertThat(resolver.supportsParameter(parameter), is(false));
+		assertThat(resolver.supportsParameter(parameter)).isFalse();
 	}
 
 	@ProjectedPayload