diff --git a/spring-data-rest-core/pom.xml b/spring-data-rest-core/pom.xml
index a8c7ff328..f03ff97a9 100644
--- a/spring-data-rest-core/pom.xml
+++ b/spring-data-rest-core/pom.xml
@@ -16,7 +16,7 @@
 	</parent>
 
 	<properties>
-		<springplugin>2.0.0.M1</springplugin>
+		<springplugin>2.0.0.M2</springplugin>
 		<evoinflector>1.2.2</evoinflector>
 		<java-module-name>spring.data.rest.core</java-module-name>
 		<project.root>${basedir}/..</project.root>
diff --git a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/support/BackendIdHandlerMethodArgumentResolverUnitTests.java b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/support/BackendIdHandlerMethodArgumentResolverUnitTests.java
index d32a2ffd1..4245a976c 100644
--- a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/support/BackendIdHandlerMethodArgumentResolverUnitTests.java
+++ b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/support/BackendIdHandlerMethodArgumentResolverUnitTests.java
@@ -52,6 +52,7 @@ public class BackendIdHandlerMethodArgumentResolverUnitTests {
 		ResourceMetadata metadata = mock(ResourceMetadata.class);
 
 		doReturn(metadata).when(delegate).resolveArgument(any(), any(), any(), any());
+		doReturn(Object.class).when(metadata).getDomainType();
 		doReturn(true).when(converter).supports(any());
 
 		MethodParameter parameter = new MethodParameter(Sample.class.getMethod("sampleMethod", Serializable.class), 0);