diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/city/City.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/city/City.java
index cd6486bf9a0..4214dc98d27 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/city/City.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/city/City.java
@@ -17,7 +17,9 @@
 package org.springframework.boot.autoconfigure.data.jdbc.city;
 
 import org.springframework.data.annotation.Id;
+import org.springframework.data.relational.core.mapping.Table;
 
+@Table("CITY")
 public class City {
 
 	@Id
diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index ffead146db6..a0d13dbdf84 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -188,7 +188,7 @@
 		<spring-amqp.version>2.2.1.BUILD-SNAPSHOT</spring-amqp.version>
 		<spring-batch.version>4.2.0.RELEASE</spring-batch.version>
 		<spring-cloud-connectors.version>2.0.6.RELEASE</spring-cloud-connectors.version>
-		<spring-data-releasetrain.version>Moore-RELEASE</spring-data-releasetrain.version>
+		<spring-data-releasetrain.version>Moore-BUILD-SNAPSHOT</spring-data-releasetrain.version>
 		<spring-framework.version>5.2.1.BUILD-SNAPSHOT</spring-framework.version>
 		<spring-hateoas.version>1.0.0.RELEASE</spring-hateoas.version>
 		<spring-integration.version>5.2.1.BUILD-SNAPSHOT</spring-integration.version>
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/jdbc/ExampleEntity.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/jdbc/ExampleEntity.java
index 0fb84e004cd..92bbc754b37 100644
--- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/jdbc/ExampleEntity.java
+++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/jdbc/ExampleEntity.java
@@ -17,12 +17,14 @@
 package org.springframework.boot.test.autoconfigure.data.jdbc;
 
 import org.springframework.data.annotation.Id;
+import org.springframework.data.relational.core.mapping.Table;
 
 /**
  * Example entity used with {@link DataJdbcTest @DataJdbcTest} tests.
  *
  * @author Andy Wilkinson
  */
+@Table("EXAMPLE_ENTITY")
 public class ExampleEntity {
 
 	@Id