diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle
index c2241c2..15cee4d 100644
--- a/gradle/dependency-management.gradle
+++ b/gradle/dependency-management.gradle
@@ -139,14 +139,11 @@ dependencyManagement {
 		dependency 'org.objenesis:objenesis:2.5.1'
 		dependency 'org.ow2.asm:asm:5.0.3'
 		dependency 'org.reactivestreams:reactive-streams:1.0.0'
-		dependency 'org.seleniumhq.selenium:htmlunit-driver:2.21'
 		dependency 'org.seleniumhq.selenium:htmlunit-driver:2.26'
-		dependency 'org.seleniumhq.selenium:selenium-api:2.53.1'
-		dependency 'org.seleniumhq.selenium:selenium-api:3.3.1'
-		dependency 'org.seleniumhq.selenium:selenium-remote-driver:2.53.1'
-		dependency 'org.seleniumhq.selenium:selenium-remote-driver:3.3.1'
-		dependency 'org.seleniumhq.selenium:selenium-support:2.53.1'
-		dependency 'org.seleniumhq.selenium:selenium-support:3.3.1'
+		dependency 'org.seleniumhq.selenium:selenium-api:3.4.0'
+		dependency 'org.seleniumhq.selenium:selenium-java:3.4.0'
+		dependency 'org.seleniumhq.selenium:selenium-remote-driver:3.4.0'
+		dependency 'org.seleniumhq.selenium:selenium-support:3.4.0'
 		dependency 'org.skyscreamer:jsonassert:1.4.0'
 		dependency 'org.slf4j:jcl-over-slf4j:1.7.25'
 		dependency 'org.slf4j:jul-to-slf4j:1.7.25'
diff --git a/samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle b/samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle
index 6aa17d2..f89e37e 100644
--- a/samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle
+++ b/samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle
@@ -3,6 +3,10 @@ apply plugin: "application"
 
 apply from: IDE_GRADLE
 
+repositories {
+	mavenCentral()
+}
+
 dependencies {
 
 	compile project(':spring-session-data-geode')
@@ -14,6 +18,12 @@ dependencies {
 	runtime "org.springframework.shell:spring-shell"
 
 	testCompile "org.springframework.boot:spring-boot-starter-test"
+	testCompile seleniumDependencies
+//	testCompile 'org.seleniumhq.selenium:htmlunit-driver'
+//	testCompile 'org.seleniumhq.selenium:selenium-api'
+//	testCompile 'org.seleniumhq.selenium:selenium-java'
+//	testCompile 'org.seleniumhq.selenium:selenium-remote-driver'
+//	testCompile 'org.seleniumhq.selenium:selenium-support'
 
 	integrationTestCompile seleniumDependencies
 
diff --git a/samples/boot/gemfire/src/integration-test/java/sample/AttributeTests.java b/samples/boot/gemfire/src/integration-test/java/sample/AttributeTests.java
index 6db2fac..4ca02aa 100644
--- a/samples/boot/gemfire/src/integration-test/java/sample/AttributeTests.java
+++ b/samples/boot/gemfire/src/integration-test/java/sample/AttributeTests.java
@@ -16,13 +16,12 @@
 
 package sample;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.openqa.selenium.WebDriver;
-import sample.client.Application;
-import sample.pages.HomePage;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
@@ -32,7 +31,10 @@ import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDriverBuilder;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.openqa.selenium.WebDriver;
+
+import sample.client.Application;
+import sample.pages.HomePage;
 
 /**
  * @author Eddú Meléndez
@@ -67,9 +69,9 @@ public class AttributeTests {
 	public void createAttribute() {
 		HomePage home = HomePage.go(this.driver, HomePage.class);
 		home = home.form()
-				.attributeName("a")
-				.attributeValue("b")
-				.submit(HomePage.class);
+			.attributeName("a")
+			.attributeValue("b")
+			.submit(HomePage.class);
 		assertThat(home.attributes()).extracting("attributeName").containsOnly("requestCount", "a");
 		assertThat(home.attributes()).extracting("attributeValue").containsOnly("1", "b");
 	}
diff --git a/samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle b/samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle
index 7d0c728..8579205 100644
--- a/samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle
+++ b/samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle
@@ -18,6 +18,7 @@ dependencies {
 
 	testCompile "junit:junit"
 	testCompile "org.assertj:assertj-core"
+	testCompile seleniumDependencies
 
 	integrationTestCompile seleniumDependencies
 
diff --git a/samples/javaconfig/gemfire-p2p/spring-session-sample-javaconfig-gemfire-p2p.gradle b/samples/javaconfig/gemfire-p2p/spring-session-sample-javaconfig-gemfire-p2p.gradle
index 01d56f3..181cc6a 100644
--- a/samples/javaconfig/gemfire-p2p/spring-session-sample-javaconfig-gemfire-p2p.gradle
+++ b/samples/javaconfig/gemfire-p2p/spring-session-sample-javaconfig-gemfire-p2p.gradle
@@ -14,6 +14,8 @@ dependencies {
 	providedCompile "javax.servlet:javax.servlet-api"
 
 	testCompile "junit:junit"
+	testCompile "org.assertj:assertj-core"
+	testCompile seleniumDependencies
 
 	integrationTestCompile seleniumDependencies
 
diff --git a/samples/xml/gemfire-clientserver/spring-session-sample-xml-gemfire-clientserver.gradle b/samples/xml/gemfire-clientserver/spring-session-sample-xml-gemfire-clientserver.gradle
index 7d0c728..8579205 100644
--- a/samples/xml/gemfire-clientserver/spring-session-sample-xml-gemfire-clientserver.gradle
+++ b/samples/xml/gemfire-clientserver/spring-session-sample-xml-gemfire-clientserver.gradle
@@ -18,6 +18,7 @@ dependencies {
 
 	testCompile "junit:junit"
 	testCompile "org.assertj:assertj-core"
+	testCompile seleniumDependencies
 
 	integrationTestCompile seleniumDependencies
 
diff --git a/samples/xml/gemfire-p2p/spring-session-sample-xml-gemfire-p2p.gradle b/samples/xml/gemfire-p2p/spring-session-sample-xml-gemfire-p2p.gradle
index 01d56f3..181cc6a 100644
--- a/samples/xml/gemfire-p2p/spring-session-sample-xml-gemfire-p2p.gradle
+++ b/samples/xml/gemfire-p2p/spring-session-sample-xml-gemfire-p2p.gradle
@@ -14,6 +14,8 @@ dependencies {
 	providedCompile "javax.servlet:javax.servlet-api"
 
 	testCompile "junit:junit"
+	testCompile "org.assertj:assertj-core"
+	testCompile seleniumDependencies
 
 	integrationTestCompile seleniumDependencies