diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java
index 1347779224..2be5115886 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java
@@ -53,6 +53,7 @@ final class DatabaseLookup {
 		map.put(DatabaseDriver.SQLSERVER, Database.SQL_SERVER);
 		map.put(DatabaseDriver.DB2, Database.DB2);
 		map.put(DatabaseDriver.INFORMIX, Database.INFORMIX);
+		map.put(DatabaseDriver.HANA, Database.HANA);
 		LOOKUP = Collections.unmodifiableMap(map);
 	}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookupTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookupTests.java
index 4d334a0a8a..cf0d6ab790 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookupTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookupTests.java
@@ -91,6 +91,10 @@ public class DatabaseLookupTests {
 	public void getDatabaseWhenInformixShouldReturnInformix() throws Exception {
 		testGetDatabase("jdbc:informix-sqli:", Database.INFORMIX);
 	}
+	@Test
+	public void getDatabaseWhenSapShouldReturnHana() throws Exception {
+		testGetDatabase("jdbc:sap:", Database.HANA);
+	}
 
 	private void testGetDatabase(String url, Database expected) throws Exception {
 		DataSource dataSource = mock(DataSource.class);