diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/ClusterConfigurationWithAuthenticationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/config/ClusterConfigurationWithAuthenticationIntegrationTests.java
similarity index 99%
rename from spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/ClusterConfigurationWithAuthenticationIntegrationTests.java
rename to spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/config/ClusterConfigurationWithAuthenticationIntegrationTests.java
index e86ce744..ddb53275 100644
--- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/ClusterConfigurationWithAuthenticationIntegrationTests.java
+++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/config/ClusterConfigurationWithAuthenticationIntegrationTests.java
@@ -13,7 +13,7 @@
  * or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.springframework.geode.boot.autoconfigure.cluster;
+package org.springframework.geode.boot.autoconfigure.cluster.config;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/ClusterConfigurationWithClusterAwareWhenNonSecureClusterAvailableIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/config/ClusterConfigurationWithClusterAwareWhenNonSecureClusterAvailableIntegrationTests.java
similarity index 98%
rename from spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/ClusterConfigurationWithClusterAwareWhenNonSecureClusterAvailableIntegrationTests.java
rename to spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/config/ClusterConfigurationWithClusterAwareWhenNonSecureClusterAvailableIntegrationTests.java
index 08966c1a..a112f1ca 100644
--- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/ClusterConfigurationWithClusterAwareWhenNonSecureClusterAvailableIntegrationTests.java
+++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/config/ClusterConfigurationWithClusterAwareWhenNonSecureClusterAvailableIntegrationTests.java
@@ -13,7 +13,7 @@
  * or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.springframework.geode.boot.autoconfigure.cluster;
+package org.springframework.geode.boot.autoconfigure.cluster.config;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/ClusterConfigurationWithClusterAwareWhenSecureClusterAvailableIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/config/ClusterConfigurationWithClusterAwareWhenSecureClusterAvailableIntegrationTests.java
similarity index 98%
rename from spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/ClusterConfigurationWithClusterAwareWhenSecureClusterAvailableIntegrationTests.java
rename to spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/config/ClusterConfigurationWithClusterAwareWhenSecureClusterAvailableIntegrationTests.java
index f338cd88..b5d447ad 100644
--- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/ClusterConfigurationWithClusterAwareWhenSecureClusterAvailableIntegrationTests.java
+++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/config/ClusterConfigurationWithClusterAwareWhenSecureClusterAvailableIntegrationTests.java
@@ -13,7 +13,7 @@
  * or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.springframework.geode.boot.autoconfigure.cluster;
+package org.springframework.geode.boot.autoconfigure.cluster.config;
 
 import static org.assertj.core.api.Assertions.assertThat;