diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java
index 98d061c4..3bd908c9 100644
--- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java
+++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java
@@ -22,8 +22,9 @@ import java.util.Properties;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
-import org.springframework.boot.SpringApplication;
+import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.data.gemfire.config.annotation.CacheServerApplication;
@@ -58,8 +59,10 @@ import org.springframework.test.context.junit4.SpringRunner;
  */
 @DirtiesContext
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = AutoConfiguredCloudSecurityContextIntegrationTests.GemFireClientConfiguration.class,
-	webEnvironment = SpringBootTest.WebEnvironment.NONE)
+@SpringBootTest(
+	classes = AutoConfiguredCloudSecurityContextIntegrationTests.GemFireClientConfiguration.class,
+	webEnvironment = SpringBootTest.WebEnvironment.NONE
+)
 @SuppressWarnings("unused")
 public class AutoConfiguredCloudSecurityContextIntegrationTests
 		extends AbstractAutoConfiguredSecurityContextIntegrationTests {
@@ -102,7 +105,10 @@ public class AutoConfiguredCloudSecurityContextIntegrationTests
 	static class GemFireServerConfiguration extends BaseGemFireServerConfiguration {
 
 		public static void main(String[] args) {
-			SpringApplication.run(GemFireServerConfiguration.class, args);
+			new SpringApplicationBuilder(GemFireServerConfiguration.class)
+				.web(WebApplicationType.NONE)
+				.build()
+				.run(args);
 		}
 	}
 }
diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java
index c200a796..c5d03fee 100644
--- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java
+++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java
@@ -20,8 +20,9 @@ import java.io.IOException;
 
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
-import org.springframework.boot.SpringApplication;
+import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.gemfire.config.annotation.CacheServerApplication;
@@ -59,8 +60,10 @@ import org.springframework.test.context.junit4.SpringRunner;
 @ActiveProfiles("security-local-client")
 @DirtiesContext
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = AutoConfiguredLocalSecurityContextIntegrationTests.GemFireClientConfiguration.class,
-	webEnvironment = SpringBootTest.WebEnvironment.NONE)
+@SpringBootTest(
+	classes = AutoConfiguredLocalSecurityContextIntegrationTests.GemFireClientConfiguration.class,
+	webEnvironment = SpringBootTest.WebEnvironment.NONE
+)
 @SuppressWarnings("unused")
 public class AutoConfiguredLocalSecurityContextIntegrationTests
 		extends AbstractAutoConfiguredSecurityContextIntegrationTests {
@@ -86,7 +89,11 @@ public class AutoConfiguredLocalSecurityContextIntegrationTests
 	static class GemFireServerConfiguration extends BaseGemFireServerConfiguration {
 
 		public static void main(String[] args) {
-			SpringApplication.run(GemFireServerConfiguration.class, args);
+
+			new SpringApplicationBuilder(GemFireServerConfiguration.class)
+				.web(WebApplicationType.NONE)
+				.build()
+				.run(args);
 		}
 	}
 }
diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/AutoConfiguredSslIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/AutoConfiguredSslIntegrationTests.java
index ea383a95..f8bf5f56 100644
--- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/AutoConfiguredSslIntegrationTests.java
+++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/AutoConfiguredSslIntegrationTests.java
@@ -27,8 +27,9 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.SpringApplication;
+import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.gemfire.GemfireTemplate;
@@ -63,8 +64,10 @@ import example.echo.config.EchoServerConfiguration;
  */
 @ActiveProfiles("ssl")
 @RunWith(SpringRunner.class)
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
-	classes = AutoConfiguredSslIntegrationTests.GemFireClientConfiguration.class)
+@SpringBootTest(
+	webEnvironment = SpringBootTest.WebEnvironment.NONE,
+	classes = AutoConfiguredSslIntegrationTests.GemFireClientConfiguration.class
+)
 @SuppressWarnings("unused")
 public class AutoConfiguredSslIntegrationTests extends ForkingClientServerIntegrationTestsSupport {
 
@@ -113,7 +116,10 @@ public class AutoConfiguredSslIntegrationTests extends ForkingClientServerIntegr
 	static class GemFireServerConfiguration {
 
 		public static void main(String[] args) {
-			SpringApplication.run(GemFireServerConfiguration.class, args);
+			new SpringApplicationBuilder(GemFireServerConfiguration.class)
+				.web(WebApplicationType.NONE)
+				.build()
+				.run(args);
 		}
 	}
 }
diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingIntegrationTests.java
index edc61439..375473ec 100644
--- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingIntegrationTests.java
+++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingIntegrationTests.java
@@ -63,7 +63,10 @@ import org.springframework.test.context.junit4.SpringRunner;
  * @since 1.0.0
  */
 @RunWith(SpringRunner.class)
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
+@SpringBootTest(
+	properties = "spring.session.data.gemfire.cache.client.region.shortcut=",
+	webEnvironment = SpringBootTest.WebEnvironment.NONE
+)
 @SuppressWarnings("unused")
 public class AutoConfiguredSessionCachingIntegrationTests {
 
diff --git a/spring-geode-autoconfigure/src/test/resources/application.properties b/spring-geode-autoconfigure/src/test/resources/application.properties
new file mode 100644
index 00000000..0a39df23
--- /dev/null
+++ b/spring-geode-autoconfigure/src/test/resources/application.properties
@@ -0,0 +1 @@
+spring.session.data.gemfire.cache.client.region.shortcut=LOCAL