diff --git a/build.gradle b/build.gradle
index 0727123..b3463bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,3 +17,5 @@ description = 'Spring Session Data Geode'
 ext.releaseBuild = version.endsWith('RELEASE')
 ext.snapshotBuild = version.endsWith('SNAPSHOT')
 ext.milestoneBuild = !(releaseBuild || snapshotBuild)
+
+ext.IDE_GRADLE = "$rootDir/gradle/ide.gradle"
diff --git a/docs/spring-session-docs.gradle b/docs/spring-session-docs.gradle
index 9b8a012..86d6b2d 100644
--- a/docs/spring-session-docs.gradle
+++ b/docs/spring-session-docs.gradle
@@ -1,7 +1,10 @@
 apply plugin: 'io.spring.convention.docs'
 apply plugin: 'io.spring.convention.spring-test'
 
+apply from: IDE_GRADLE
+
 dependencies {
+
 	testCompile project(':spring-session-data-geode')
 	testCompile "javax.servlet:javax.servlet-api"
 	testCompile "junit:junit"
@@ -9,6 +12,10 @@ dependencies {
 	testCompile "org.mockito:mockito-core"
 	testCompile "edu.umd.cs.mtc:multithreadedtc"
 	testCompile "org.springframework:spring-test"
+	testCompile "org.springframework.security:spring-security-core"
+	testCompile "org.springframework.security:spring-security-test"
+	testCompile "org.springframework.security:spring-security-web"
+
 }
 
 def versions = dependencyManagement.managedVersions
@@ -19,18 +26,16 @@ asciidoctor {
 	def ghUrl = "https://github.com/spring-projects/spring-session/tree/$ghTag"
 
 	attributes	'version-snapshot': snapshotBuild,
-			'version-milestone': milestoneBuild,
-			'version-release': releaseBuild,
-			'gh-url': ghUrl,
-			'gh-samples-url': "$ghUrl/samples/",
-			'download-url' : "https://github.com/spring-projects/spring-session/archive/${ghTag}.zip",
-			'spring-session-version' : version,
-			'spring-version' : versions['org.springframework:spring-core'],
-			'lettuce-version' : versions['io.lettuce:lettuce-core'],
-			'hazelcast-version' : versions['com.hazelcast:hazelcast'],
-			'docs-itest-dir' : rootProject.projectDir.path + '/docs/src/integration-test/java/',
-			'docs-test-dir' : rootProject.projectDir.path + '/docs/src/test/java/',
-			'docs-test-resources-dir' : rootProject.projectDir.path + '/docs/src/test/resources/',
-			'samples-dir' : rootProject.projectDir.path + '/samples/',
-			'session-main-resources-dir' : rootProject.projectDir.path + '/spring-session/src/main/resources/'
+		'version-milestone': milestoneBuild,
+		'version-release': releaseBuild,
+		'gh-url': ghUrl,
+		'gh-samples-url': "$ghUrl/samples/",
+		'download-url' : "https://github.com/spring-projects/spring-session/archive/${ghTag}.zip",
+		'spring-version' : versions['org.springframework:spring-core'],
+		'spring-session-version' : version,
+		'docs-itest-dir' : rootProject.projectDir.path + '/docs/src/integration-test/java/',
+		'docs-test-dir' : rootProject.projectDir.path + '/docs/src/test/java/',
+		'docs-test-resources-dir' : rootProject.projectDir.path + '/docs/src/test/resources/',
+		'samples-dir' : rootProject.projectDir.path + '/samples/',
+		'session-main-resources-dir' : rootProject.projectDir.path + '/spring-session/src/main/resources/'
 }
diff --git a/gradle/ide.gradle b/gradle/ide.gradle
new file mode 100644
index 0000000..91a35f6
--- /dev/null
+++ b/gradle/ide.gradle
@@ -0,0 +1,6 @@
+idea {
+	module {
+		testSourceDirs += file('src/integration-test/java')
+	}
+}
+
diff --git a/samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle b/samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle
index 7f9c2fb..6aa17d2 100644
--- a/samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle
+++ b/samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle
@@ -1,7 +1,10 @@
 apply plugin: 'io.spring.convention.spring-sample-boot'
 apply plugin: "application"
 
+apply from: IDE_GRADLE
+
 dependencies {
+
 	compile project(':spring-session-data-geode')
 	compile "org.springframework.boot:spring-boot-starter-thymeleaf"
 	compile "org.springframework.boot:spring-boot-starter-web"
@@ -15,6 +18,7 @@ dependencies {
 	integrationTestCompile seleniumDependencies
 
 	integrationTestRuntime "org.springframework.shell:spring-shell"
+
 }
 
 run {
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 580676e..7d0c728 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
@@ -1,7 +1,10 @@
 apply plugin: 'io.spring.convention.spring-sample-war'
 apply plugin: "gemfire-server"
 
+apply from: IDE_GRADLE
+
 dependencies {
+
 	compile project(':spring-session-data-geode')
 	compile "org.springframework:spring-web"
 	compile "org.webjars:bootstrap"
@@ -19,4 +22,5 @@ dependencies {
 	integrationTestCompile seleniumDependencies
 
 	integrationTestRuntime "org.springframework.shell:spring-shell"
-}
\ No newline at end of file
+
+}
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 7cddfd7..5c9a7b4 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
@@ -1,6 +1,9 @@
 apply plugin: 'io.spring.convention.spring-sample-war'
 
+apply from: IDE_GRADLE
+
 dependencies {
+
 	compile project(':spring-session-data-geode')
 	compile "org.springframework:spring-web"
 	compile "org.webjars:bootstrap"
@@ -16,4 +19,5 @@ dependencies {
 	integrationTestCompile "org.assertj:assertj-core"
 
 	integrationTestRuntime "org.springframework.shell:spring-shell"
+
 }
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 013e75f..7d0c728 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
@@ -1,7 +1,10 @@
 apply plugin: 'io.spring.convention.spring-sample-war'
 apply plugin: "gemfire-server"
 
+apply from: IDE_GRADLE
+
 dependencies {
+
 	compile project(':spring-session-data-geode')
 	compile "org.springframework:spring-web"
 	compile "org.webjars:bootstrap"
@@ -19,4 +22,5 @@ dependencies {
 	integrationTestCompile seleniumDependencies
 
 	integrationTestRuntime "org.springframework.shell:spring-shell"
+
 }
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 7cddfd7..5c9a7b4 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
@@ -1,6 +1,9 @@
 apply plugin: 'io.spring.convention.spring-sample-war'
 
+apply from: IDE_GRADLE
+
 dependencies {
+
 	compile project(':spring-session-data-geode')
 	compile "org.springframework:spring-web"
 	compile "org.webjars:bootstrap"
@@ -16,4 +19,5 @@ dependencies {
 	integrationTestCompile "org.assertj:assertj-core"
 
 	integrationTestRuntime "org.springframework.shell:spring-shell"
+
 }
diff --git a/spring-session-data-geode/spring-session-data-geode.gradle b/spring-session-data-geode/spring-session-data-geode.gradle
index ec1356c..57c1363 100644
--- a/spring-session-data-geode/spring-session-data-geode.gradle
+++ b/spring-session-data-geode/spring-session-data-geode.gradle
@@ -1,5 +1,6 @@
 apply plugin: 'io.spring.convention.spring-module'
-apply plugin: 'io.spring.convention.integration-test'
+
+apply from: IDE_GRADLE
 
 description = "Spring Session Data Geode"
 
@@ -21,7 +22,6 @@ dependencies {
 	testCompile "edu.umd.cs.mtc:multithreadedtc:$multithreadedtcVersion"
 	testCompile "org.springframework:spring-test"
 	testCompile "org.springframework:spring-web"
-	testCompile "org.springframework.security:spring-security-test"
 	testCompile slf4jDependencies
 
 	integrationTestRuntime "org.springframework.shell:spring-shell"