diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle
index e012c3ba..1144c3ba 100644
--- a/gradle/dependency-management.gradle
+++ b/gradle/dependency-management.gradle
@@ -5,7 +5,7 @@ dependencyManagement {
 		mavenBom 'org.springframework:spring-framework-bom:5.1.0.RC3'
 		mavenBom 'org.springframework.data:spring-data-releasetrain:Lovelace-RC2'
 		mavenBom 'org.springframework.security:spring-security-bom:5.1.0.RC2'
-		mavenBom 'org.testcontainers:testcontainers-bom:1.8.3'
+		mavenBom 'org.testcontainers:testcontainers-bom:1.9.0-rc1'
 	}
 
 	dependencies {
diff --git a/samples/boot/findbyusername/src/integration-test/resources/testcontainers.properties b/samples/boot/findbyusername/src/integration-test/resources/testcontainers.properties
new file mode 100644
index 00000000..e3e83419
--- /dev/null
+++ b/samples/boot/findbyusername/src/integration-test/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.timeout=120
diff --git a/samples/boot/redis-json/src/integration-test/resources/testcontainers.properties b/samples/boot/redis-json/src/integration-test/resources/testcontainers.properties
new file mode 100644
index 00000000..e3e83419
--- /dev/null
+++ b/samples/boot/redis-json/src/integration-test/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.timeout=120
diff --git a/samples/boot/redis/src/integration-test/resources/testcontainers.properties b/samples/boot/redis/src/integration-test/resources/testcontainers.properties
new file mode 100644
index 00000000..e3e83419
--- /dev/null
+++ b/samples/boot/redis/src/integration-test/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.timeout=120
diff --git a/samples/boot/webflux/src/integration-test/resources/testcontainers.properties b/samples/boot/webflux/src/integration-test/resources/testcontainers.properties
new file mode 100644
index 00000000..e3e83419
--- /dev/null
+++ b/samples/boot/webflux/src/integration-test/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.timeout=120
diff --git a/samples/boot/websocket/spring-session-sample-boot-websocket.gradle b/samples/boot/websocket/spring-session-sample-boot-websocket.gradle
index 9ca93f5c..6093da3b 100644
--- a/samples/boot/websocket/spring-session-sample-boot-websocket.gradle
+++ b/samples/boot/websocket/spring-session-sample-boot-websocket.gradle
@@ -23,5 +23,6 @@ dependencies {
 
 	testCompile "org.springframework.boot:spring-boot-starter-test"
 	testCompile "org.springframework.security:spring-security-test"
-	testCompile "org.testcontainers:testcontainers"
+
+	integrationTestCompile "org.testcontainers:testcontainers"
 }
diff --git a/samples/boot/websocket/src/test/java/sample/ApplicationTests.java b/samples/boot/websocket/src/integration-test/java/sample/ApplicationTests.java
similarity index 100%
rename from samples/boot/websocket/src/test/java/sample/ApplicationTests.java
rename to samples/boot/websocket/src/integration-test/java/sample/ApplicationTests.java
diff --git a/samples/boot/websocket/src/integration-test/resources/testcontainers.properties b/samples/boot/websocket/src/integration-test/resources/testcontainers.properties
new file mode 100644
index 00000000..e3e83419
--- /dev/null
+++ b/samples/boot/websocket/src/integration-test/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.timeout=120
diff --git a/samples/javaconfig/custom-cookie/src/main/resources/testcontainers.properties b/samples/javaconfig/custom-cookie/src/main/resources/testcontainers.properties
new file mode 100644
index 00000000..e3e83419
--- /dev/null
+++ b/samples/javaconfig/custom-cookie/src/main/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.timeout=120
diff --git a/samples/javaconfig/redis/src/main/resources/testcontainers.properties b/samples/javaconfig/redis/src/main/resources/testcontainers.properties
new file mode 100644
index 00000000..e3e83419
--- /dev/null
+++ b/samples/javaconfig/redis/src/main/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.timeout=120
diff --git a/samples/javaconfig/rest/spring-session-sample-javaconfig-rest.gradle b/samples/javaconfig/rest/spring-session-sample-javaconfig-rest.gradle
index bc0b70b6..65be98eb 100644
--- a/samples/javaconfig/rest/spring-session-sample-javaconfig-rest.gradle
+++ b/samples/javaconfig/rest/spring-session-sample-javaconfig-rest.gradle
@@ -17,8 +17,6 @@ dependencies {
 	testCompile "org.springframework.security:spring-security-test"
 	testCompile "org.assertj:assertj-core"
 	testCompile "org.springframework:spring-test"
-
-	integrationTestCompile "org.testcontainers:testcontainers"
 }
 
 gretty {
diff --git a/samples/javaconfig/rest/src/main/resources/testcontainers.properties b/samples/javaconfig/rest/src/main/resources/testcontainers.properties
new file mode 100644
index 00000000..e3e83419
--- /dev/null
+++ b/samples/javaconfig/rest/src/main/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.timeout=120
diff --git a/samples/javaconfig/security/src/main/resources/testcontainers.properties b/samples/javaconfig/security/src/main/resources/testcontainers.properties
new file mode 100644
index 00000000..e3e83419
--- /dev/null
+++ b/samples/javaconfig/security/src/main/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.timeout=120
diff --git a/samples/xml/redis/src/main/resources/testcontainers.properties b/samples/xml/redis/src/main/resources/testcontainers.properties
new file mode 100644
index 00000000..e3e83419
--- /dev/null
+++ b/samples/xml/redis/src/main/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.timeout=120
diff --git a/spring-session-data-redis/src/integration-test/resources/testcontainers.properties b/spring-session-data-redis/src/integration-test/resources/testcontainers.properties
new file mode 100644
index 00000000..e3e83419
--- /dev/null
+++ b/spring-session-data-redis/src/integration-test/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.timeout=120
diff --git a/spring-session-hazelcast/src/integration-test/resources/testcontainers.properties b/spring-session-hazelcast/src/integration-test/resources/testcontainers.properties
new file mode 100644
index 00000000..e3e83419
--- /dev/null
+++ b/spring-session-hazelcast/src/integration-test/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.timeout=120
diff --git a/spring-session-jdbc/src/integration-test/resources/testcontainers.properties b/spring-session-jdbc/src/integration-test/resources/testcontainers.properties
new file mode 100644
index 00000000..e3e83419
--- /dev/null
+++ b/spring-session-jdbc/src/integration-test/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.timeout=120