diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 6302067640..308ef718c4 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -71,7 +71,7 @@
 		<gemfire.version>8.1.0</gemfire.version>
 		<glassfish-el.version>3.0.0</glassfish-el.version>
 		<gradle.version>1.12</gradle.version>
-		<groovy.version>2.4.5</groovy.version>
+		<groovy.version>2.4.4</groovy.version>
 		<gson.version>2.3.1</gson.version>
 		<h2.version>1.4.190</h2.version>
 		<hamcrest.version>1.3</hamcrest.version>
diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
index 96e2e9c0de..56ddb31bc1 100644
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -2123,10 +2123,12 @@ For example, typical POM dependencies would be:
 	</dependency>
 ----
 
-TIP: If you're using H2 and, for whatever reason, you do configure its connection URL,
-care should be taken to disable the database's automatic shutdown using
-`DB_CLOSE_ON_EXIT=FALSE`. This allows Spring Boot to control when the database is closed,
-thereby ensuring that it happens once access to the database is no longer needed.
+TIP: If, for whatever reason, you do configure the connection URL for an embedded
+database, care should be taken to ensure that the database’s automatic shutdown is
+disabled. If you're using H2 you should use `DB_CLOSE_ON_EXIT=FALSE` to do so. If you're
+using HSQLDB, you should ensure that `shutdown=true` is not used. Disabling the database's
+automatic shutdown allows Spring Boot to control when the database is closed, thereby
+ensuring that it happens once access to the database is no longer needed.
 
 NOTE: You need a dependency on `spring-jdbc` for an embedded database to be
 auto-configured. In this example it's pulled in transitively via
diff --git a/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java b/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java
index 3f94bd7efb..c357a7a55e 100644
--- a/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java
+++ b/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java
@@ -82,7 +82,6 @@ public class SpringApplicationContextLoader extends AbstractContextLoader {
 			throws Exception {
 		assertValidAnnotations(config.getTestClass());
 		SpringApplication application = getSpringApplication();
-		application.setRegisterShutdownHook(false);
 		application.setMainApplicationClass(config.getTestClass());
 		application.setSources(getSources(config));
 		ConfigurableEnvironment environment = new StandardEnvironment();