diff --git a/spring-boot-samples/spring-boot-sample-flyway/README.adoc b/spring-boot-samples/spring-boot-sample-flyway/README.adoc
new file mode 100644
index 0000000000..46d1e6c5f7
--- /dev/null
+++ b/spring-boot-samples/spring-boot-sample-flyway/README.adoc
@@ -0,0 +1,9 @@
+== Spring Boot Flyway Sample
+
+This sample demonstrates the flyway auto-configuration support.
+
+You can look at `http//localhost:8080/flyway` to review the list of scripts.
+
+This sample also enables the H2 console (at `http//localhost:8080/h2-console`)
+so that you can review the state of the database (the default jdbc url is
+`jdbc:h2:mem:testdb`).
diff --git a/spring-boot-samples/spring-boot-sample-flyway/pom.xml b/spring-boot-samples/spring-boot-sample-flyway/pom.xml
index 97405d81cb..adf97c81e7 100644
--- a/spring-boot-samples/spring-boot-sample-flyway/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-flyway/pom.xml
@@ -23,15 +23,25 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-actuator</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.flywaydb</groupId>
 			<artifactId>flyway-core</artifactId>
 		</dependency>
+
 		<dependency>
-			<groupId>org.hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
 			<scope>runtime</scope>
 		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/spring-boot-samples/spring-boot-sample-flyway/src/main/resources/application.properties b/spring-boot-samples/spring-boot-sample-flyway/src/main/resources/application.properties
index 2cbca2b524..d18bea2e53 100644
--- a/spring-boot-samples/spring-boot-sample-flyway/src/main/resources/application.properties
+++ b/spring-boot-samples/spring-boot-sample-flyway/src/main/resources/application.properties
@@ -1 +1,3 @@
-spring.jpa.hibernate.ddl-auto: validate
\ No newline at end of file
+spring.jpa.hibernate.ddl-auto=validate
+
+spring.h2.console.enabled=true
\ No newline at end of file
diff --git a/spring-boot-samples/spring-boot-sample-liquibase/README.adoc b/spring-boot-samples/spring-boot-sample-liquibase/README.adoc
new file mode 100644
index 0000000000..f3acd7274e
--- /dev/null
+++ b/spring-boot-samples/spring-boot-sample-liquibase/README.adoc
@@ -0,0 +1,9 @@
+== Spring Boot Liquibase Sample
+
+This sample demonstrates the liquibase auto-configuration support.
+
+You can look at `http//localhost:8080/liquibase` to review the list of scripts.
+
+This sample also enables the H2 console (at `http//localhost:8080/h2-console`)
+so that you can review the state of the database (the default jdbc url is
+`jdbc:h2:mem:testdb`).
diff --git a/spring-boot-samples/spring-boot-sample-liquibase/pom.xml b/spring-boot-samples/spring-boot-sample-liquibase/pom.xml
index aed22cfab3..2f50576775 100644
--- a/spring-boot-samples/spring-boot-sample-liquibase/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-liquibase/pom.xml
@@ -23,15 +23,25 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jdbc</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-actuator</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.liquibase</groupId>
 			<artifactId>liquibase-core</artifactId>
 		</dependency>
+
 		<dependency>
-			<groupId>org.hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
 			<scope>runtime</scope>
 		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/spring-boot-samples/spring-boot-sample-liquibase/src/main/resources/application.properties b/spring-boot-samples/spring-boot-sample-liquibase/src/main/resources/application.properties
index bb3f2d169b..288b7e85ad 100644
--- a/spring-boot-samples/spring-boot-sample-liquibase/src/main/resources/application.properties
+++ b/spring-boot-samples/spring-boot-sample-liquibase/src/main/resources/application.properties
@@ -1 +1,3 @@
-spring.jpa.hibernate.ddl-auto: none
+spring.jpa.hibernate.ddl-auto=none
+
+spring.h2.console.enabled=true