diff --git a/pom.xml b/pom.xml
index 37a7151c5..fccbdaa8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.hateoas</groupId>
 	<artifactId>spring-hateoas</artifactId>
-	<version>1.1.0.BUILD-SNAPSHOT</version>
+	<version>1.1.0.HATEOAS-1260-SNAPSHOT</version>
 
 	<name>Spring HATEOAS</name>
 	<url>https://github.com/spring-projects/spring-hateoas</url>
diff --git a/src/test/java/org/springframework/hateoas/support/CustomHypermediaType.java b/src/test/java/org/springframework/hateoas/support/CustomHypermediaType.java
index f66ee67de..1edec25fd 100644
--- a/src/test/java/org/springframework/hateoas/support/CustomHypermediaType.java
+++ b/src/test/java/org/springframework/hateoas/support/CustomHypermediaType.java
@@ -19,6 +19,11 @@
 import java.util.List;
 
 import org.springframework.hateoas.config.HypermediaMappingInformation;
+import org.springframework.hateoas.mediatype.MessageResolver;
+import org.springframework.hateoas.mediatype.hal.CurieProvider;
+import org.springframework.hateoas.mediatype.hal.Jackson2HalModule;
+import org.springframework.hateoas.mediatype.hal.Jackson2HalModule.HalHandlerInstantiator;
+import org.springframework.hateoas.server.core.EvoInflectorLinkRelationProvider;
 import org.springframework.http.MediaType;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
@@ -47,6 +52,9 @@ public List<MediaType> getMediaTypes() {
 	@Override
 	public ObjectMapper configureObjectMapper(ObjectMapper mapper) {
 
+		mapper.registerModule(new Jackson2HalModule());
+		mapper.setHandlerInstantiator(new HalHandlerInstantiator(new EvoInflectorLinkRelationProvider(),
+				CurieProvider.NONE, MessageResolver.DEFAULTS_ONLY));
 		mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
 		mapper.enable(SerializationFeature.INDENT_OUTPUT);
 
diff --git a/src/test/resources/org/springframework/hateoas/config/webflux-frodo.json b/src/test/resources/org/springframework/hateoas/config/webflux-frodo.json
index c7bb07c9d..d9e29209a 100644
--- a/src/test/resources/org/springframework/hateoas/config/webflux-frodo.json
+++ b/src/test/resources/org/springframework/hateoas/config/webflux-frodo.json
@@ -1,8 +1,9 @@
 {
   "name" : "Frodo Baggins",
   "role" : "ring bearer",
-  "links" : [ {
-    "rel" : "self",
-    "href" : "http://localhost/employees/1"
-  } ]
-}
\ No newline at end of file
+  "_links" : {
+    "self" : {
+      "href" : "http://localhost/employees/1"
+    }
+  }
+}
diff --git a/src/test/resources/org/springframework/hateoas/config/webmvc-frodo.json b/src/test/resources/org/springframework/hateoas/config/webmvc-frodo.json
index c7bb07c9d..d9e29209a 100644
--- a/src/test/resources/org/springframework/hateoas/config/webmvc-frodo.json
+++ b/src/test/resources/org/springframework/hateoas/config/webmvc-frodo.json
@@ -1,8 +1,9 @@
 {
   "name" : "Frodo Baggins",
   "role" : "ring bearer",
-  "links" : [ {
-    "rel" : "self",
-    "href" : "http://localhost/employees/1"
-  } ]
-}
\ No newline at end of file
+  "_links" : {
+    "self" : {
+      "href" : "http://localhost/employees/1"
+    }
+  }
+}