diff --git a/pom.xml b/pom.xml
index cbefe79171..2dad9db13d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -563,6 +563,11 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
+            <dependency>
+              <groupId>org.springframework.hateoas</groupId>
+              <artifactId>spring-hateoas</artifactId>
+              <version>0.5.0.RELEASE</version>
+            </dependency>
             <dependency>
               <groupId>org.aspectj</groupId>
               <artifactId>aspectjrt</artifactId>
diff --git a/spring-bootstrap/pom.xml b/spring-bootstrap/pom.xml
index ba034f9f13..94b45b3691 100644
--- a/spring-bootstrap/pom.xml
+++ b/spring-bootstrap/pom.xml
@@ -94,6 +94,11 @@
 			<artifactId>spring-data-jpa</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.hateoas</groupId>
+			<artifactId>spring-hateoas</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.batch</groupId>
 			<artifactId>spring-batch-core</artifactId>
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaWebAutoConfigurationTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaWebAutoConfigurationTests.java
new file mode 100644
index 0000000000..8049c9b8f1
--- /dev/null
+++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaWebAutoConfigurationTests.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2012-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.bootstrap.autoconfigure.data;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.springframework.bootstrap.autoconfigure.PropertyPlaceholderAutoConfiguration;
+import org.springframework.bootstrap.autoconfigure.data.test.City;
+import org.springframework.bootstrap.autoconfigure.data.test.CityRepository;
+import org.springframework.bootstrap.autoconfigure.jdbc.EmbeddedDatabaseConfiguration;
+import org.springframework.bootstrap.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.repository.support.DomainClassConverter;
+import org.springframework.mock.web.MockServletContext;
+import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
+
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * @author Dave Syer
+ * 
+ */
+@Ignore
+// until spring data commons 1.6.0, jpa 1.5.0 available
+public class JpaWebAutoConfigurationTests {
+
+	private AnnotationConfigWebApplicationContext context;
+
+	@Test
+	public void testDefaultRepositoryConfiguration() throws Exception {
+		this.context = new AnnotationConfigWebApplicationContext();
+		this.context.setServletContext(new MockServletContext());
+		this.context.register(TestConfiguration.class,
+				EmbeddedDatabaseConfiguration.class, HibernateJpaAutoConfiguration.class,
+				JpaRepositoriesAutoConfiguration.class,
+				PropertyPlaceholderAutoConfiguration.class);
+		this.context.refresh();
+		assertNotNull(this.context.getBean(CityRepository.class));
+		assertNotNull(this.context.getBean(DomainClassConverter.class));
+	}
+
+	@Configuration
+	// @EnableSpringDataWebSupport
+	@ComponentScan(basePackageClasses = City.class)
+	protected static class TestConfiguration {
+
+	}
+
+}