diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/PropertyConfiguredStrictMatchingClusterNotAvailableConfigurationIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/PropertyConfiguredStrictMatchingClusterNotAvailableConfigurationIntegrationTests.java
index a7980710..c4a8f511 100644
--- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/PropertyConfiguredStrictMatchingClusterNotAvailableConfigurationIntegrationTests.java
+++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/PropertyConfiguredStrictMatchingClusterNotAvailableConfigurationIntegrationTests.java
@@ -23,6 +23,7 @@ import org.junit.AfterClass;
 import org.junit.Test;
 
 import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.cache.client.ClientRegionShortcut;
 
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.core.NestedExceptionUtils;
@@ -88,6 +89,10 @@ public class PropertyConfiguredStrictMatchingClusterNotAvailableConfigurationInt
 
 			throw expected;
 		}
+		finally {
+			assertThat(System.getProperty(ClusterAwareConfiguration.SPRING_DATA_GEMFIRE_CACHE_CLIENT_REGION_SHORTCUT_PROPERTY))
+				.isEqualTo(ClientRegionShortcut.LOCAL.name());
+		}
 	}
 
 	@ClientCacheApplication
diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/StrictMatchingClusterNotAvailableConfigurationIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/StrictMatchingClusterNotAvailableConfigurationIntegrationTests.java
index add974fe..32318229 100644
--- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/StrictMatchingClusterNotAvailableConfigurationIntegrationTests.java
+++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/StrictMatchingClusterNotAvailableConfigurationIntegrationTests.java
@@ -21,6 +21,7 @@ import org.junit.AfterClass;
 import org.junit.Test;
 
 import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.cache.client.ClientRegionShortcut;
 
 import org.springframework.core.NestedExceptionUtils;
 import org.springframework.data.gemfire.config.annotation.ClientCacheApplication;
@@ -69,6 +70,10 @@ public class StrictMatchingClusterNotAvailableConfigurationIntegrationTests
 
 			throw expected;
 		}
+		finally {
+			assertThat(System.getProperty(ClusterAwareConfiguration.SPRING_DATA_GEMFIRE_CACHE_CLIENT_REGION_SHORTCUT_PROPERTY))
+				.isEqualTo(ClientRegionShortcut.LOCAL.name());
+		}
 	}
 
 	@ClientCacheApplication