diff --git a/src/test/java/org/springframework/data/web/HateoasPageableHandlerMethodArgumentResolverUnitTests.java b/src/test/java/org/springframework/data/web/HateoasPageableHandlerMethodArgumentResolverUnitTests.java
index 8145d8a6c..5cf7628c0 100644
--- a/src/test/java/org/springframework/data/web/HateoasPageableHandlerMethodArgumentResolverUnitTests.java
+++ b/src/test/java/org/springframework/data/web/HateoasPageableHandlerMethodArgumentResolverUnitTests.java
@@ -106,6 +106,25 @@ public class HateoasPageableHandlerMethodArgumentResolverUnitTests extends
 		assertThat(variables, is("{?foo,size,sort}"));
 	}
 
+	/**
+	 * @see DATACMNS-563
+	 */
+	@Test
+	public void enablingOneIndexedParameterReturnsOneForFirstPage() {
+
+		HateoasPageableHandlerMethodArgumentResolver resolver = getResolver();
+		resolver.setOneIndexedParameters(true);
+
+		UriComponentsBuilder builder = UriComponentsBuilder.fromPath("/");
+
+		resolver.enhance(builder, null, new PageRequest(0, 10));
+
+		MultiValueMap<String, String> params = builder.build().getQueryParams();
+
+		assertThat(params.containsKey(resolver.getPageParameterName()), is(true));
+		assertThat(params.getFirst(resolver.getPageParameterName()), is("1"));
+	}
+
 	@Override
 	protected HateoasPageableHandlerMethodArgumentResolver getResolver() {
 
diff --git a/src/test/java/org/springframework/data/web/PageableHandlerMethodArgumentResolverUnitTests.java b/src/test/java/org/springframework/data/web/PageableHandlerMethodArgumentResolverUnitTests.java
index 8e7f20398..03bf85460 100644
--- a/src/test/java/org/springframework/data/web/PageableHandlerMethodArgumentResolverUnitTests.java
+++ b/src/test/java/org/springframework/data/web/PageableHandlerMethodArgumentResolverUnitTests.java
@@ -200,6 +200,22 @@ public class PageableHandlerMethodArgumentResolverUnitTests extends PageableDefa
 				is(nullValue()));
 	}
 
+	/**
+	 * @see DATACMNS-563
+	 */
+	@Test
+	public void considersOneIndexedParametersSetting() {
+
+		PageableHandlerMethodArgumentResolver resolver = getResolver();
+		resolver.setOneIndexedParameters(true);
+
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addParameter("page", "1");
+
+		assertThat(resolver.resolveArgument(supportedMethodParameter, null, new ServletWebRequest(request), null)
+				.getPageNumber(), is(0));
+	}
+
 	@Override
 	protected PageableHandlerMethodArgumentResolver getResolver() {
 		PageableHandlerMethodArgumentResolver resolver = new PageableHandlerMethodArgumentResolver();