diff --git a/.gitignore b/.gitignore
index 480f655d..7918d075 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,4 +77,4 @@ crashlytics-build.properties
 .settings/
 .project
 .classpath
-.factorypath
+.factorypath
\ No newline at end of file
diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsFromFilePathsSpringBootTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsFromFilePathsTests.java
similarity index 95%
rename from spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsFromFilePathsSpringBootTest.java
rename to spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsFromFilePathsTests.java
index 23190d53..c987fe19 100644
--- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsFromFilePathsSpringBootTest.java
+++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsFromFilePathsTests.java
@@ -44,10 +44,10 @@ import static org.springframework.cloud.kubernetes.config.ConfigMapTestUtil.crea
 		properties = { "spring.application.name=configmap-path-example",
 				"spring.cloud.kubernetes.config.enableApi=false",
 				"spring.cloud.kubernetes.config.paths="
-						+ ConfigMapsFromFilePathsSpringBootTest.FIRST_FILE_NAME_FULL_PATH
+						+ ConfigMapsFromFilePathsTests.FIRST_FILE_NAME_FULL_PATH
 						+ ","
-						+ ConfigMapsFromFilePathsSpringBootTest.SECOND_FILE_NAME_FULL_PATH })
-public class ConfigMapsFromFilePathsSpringBootTest {
+						+ ConfigMapsFromFilePathsTests.SECOND_FILE_NAME_FULL_PATH })
+public class ConfigMapsFromFilePathsTests {
 
 	protected static final String FILES_ROOT_PATH = "/tmp/scktests";
 
diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsMixedSpringBootTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsMixedTests.java
similarity index 96%
rename from spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsMixedSpringBootTest.java
rename to spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsMixedTests.java
index 63d11c26..1e458e54 100644
--- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsMixedSpringBootTest.java
+++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsMixedTests.java
@@ -45,11 +45,11 @@ import static org.springframework.cloud.kubernetes.config.ConfigMapTestUtil.read
 		classes = App.class,
 		properties = {
 				"spring.application.name="
-						+ ConfigMapsMixedSpringBootTest.APPLICATION_NAME,
+						+ ConfigMapsMixedTests.APPLICATION_NAME,
 				"spring.cloud.kubernetes.config.enableApi=true",
 				"spring.cloud.kubernetes.config.paths="
-						+ ConfigMapsMixedSpringBootTest.FILE_NAME_FULL_PATH })
-public class ConfigMapsMixedSpringBootTest {
+						+ ConfigMapsMixedTests.FILE_NAME_FULL_PATH })
+public class ConfigMapsMixedTests {
 
 	protected static final String FILES_ROOT_PATH = "/tmp/scktests";
 
diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsSpringBootTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsTests.java
similarity index 98%
rename from spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsSpringBootTest.java
rename to spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsTests.java
index 246395fe..699b43f9 100644
--- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsSpringBootTest.java
+++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsTests.java
@@ -45,7 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 		classes = App.class, properties = { "spring.application.name=configmap-example",
 				"spring.cloud.kubernetes.reload.enabled=false" })
 @AutoConfigureWebTestClient
-public class ConfigMapsSpringBootTest {
+public class ConfigMapsTests {
 
 	private static final String APPLICATION_NAME = "configmap-example";
 
diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithActiveProfilesNameSpringBootTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithActiveProfilesNameTests.java
similarity index 98%
rename from spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithActiveProfilesNameSpringBootTest.java
rename to spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithActiveProfilesNameTests.java
index eb4abecc..2496cf63 100644
--- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithActiveProfilesNameSpringBootTest.java
+++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithActiveProfilesNameTests.java
@@ -47,7 +47,7 @@ import static org.springframework.cloud.kubernetes.config.ConfigMapTestUtil.read
 		"spring.cloud.kubernetes.reload.enabled=false" })
 @ActiveProfiles("development")
 @AutoConfigureWebTestClient
-public class ConfigMapsWithActiveProfilesNameSpringBootTest {
+public class ConfigMapsWithActiveProfilesNameTests {
 
 	private static final String APPLICATION_NAME = "configmap-with-active-profile-name-example";
 
diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfileExpressionSpringBootTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfileExpressionTests.java
similarity index 98%
rename from spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfileExpressionSpringBootTest.java
rename to spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfileExpressionTests.java
index 83ec370b..31d6cb3e 100644
--- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfileExpressionSpringBootTest.java
+++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfileExpressionTests.java
@@ -47,7 +47,7 @@ import static org.springframework.cloud.kubernetes.config.ConfigMapTestUtil.read
 				"spring.cloud.kubernetes.reload.enabled=false" })
 @ActiveProfiles({ "production", "us-east" })
 @AutoConfigureWebTestClient
-public class ConfigMapsWithProfileExpressionSpringBootTest {
+public class ConfigMapsWithProfileExpressionTests {
 
 	@ClassRule
 	public static KubernetesServer server = new KubernetesServer();
diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesNoActiveProfileSpringBootTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesNoActiveProfileTests.java
similarity index 98%
rename from spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesNoActiveProfileSpringBootTest.java
rename to spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesNoActiveProfileTests.java
index c558dc83..9cb2cfc6 100644
--- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesNoActiveProfileSpringBootTest.java
+++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesNoActiveProfileTests.java
@@ -46,7 +46,7 @@ import static org.springframework.cloud.kubernetes.config.ConfigMapTestUtil.read
 				"spring.application.name=configmap-with-profile-no-active-profiles-example",
 				"spring.cloud.kubernetes.reload.enabled=false" })
 @AutoConfigureWebTestClient
-public class ConfigMapsWithProfilesNoActiveProfileSpringBootTest {
+public class ConfigMapsWithProfilesNoActiveProfileTests {
 
 	private static final String APPLICATION_NAME = "configmap-with-profile-no-active-profiles-example";
 
diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesSpringBootTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesTests.java
similarity index 98%
rename from spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesSpringBootTest.java
rename to spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesTests.java
index 4af184bb..b828e187 100644
--- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesSpringBootTest.java
+++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesTests.java
@@ -47,7 +47,7 @@ import static org.springframework.cloud.kubernetes.config.ConfigMapTestUtil.read
 				"spring.cloud.kubernetes.reload.enabled=false" })
 @ActiveProfiles("development")
 @AutoConfigureWebTestClient
-public class ConfigMapsWithProfilesSpringBootTest {
+public class ConfigMapsWithProfilesTests {
 
 	private static final String APPLICATION_NAME = "configmap-with-profile-example";
 
diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithoutProfilesSpringBootTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithoutProfilesTests.java
similarity index 98%
rename from spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithoutProfilesSpringBootTest.java
rename to spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithoutProfilesTests.java
index 657b5ff3..c987f710 100644
--- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithoutProfilesSpringBootTest.java
+++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithoutProfilesTests.java
@@ -44,7 +44,7 @@ import static org.springframework.cloud.kubernetes.config.ConfigMapTestUtil.read
 				"spring.cloud.kubernetes.reload.enabled=false" })
 @ActiveProfiles("development")
 @AutoConfigureWebTestClient
-public class ConfigMapsWithoutProfilesSpringBootTest {
+public class ConfigMapsWithoutProfilesTests {
 
 	private static final String APPLICATION_NAME = "configmap-without-profile-example";
 
diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MultipleConfigMapsSpringBootTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MultipleConfigMapsTests.java
similarity index 98%
rename from spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MultipleConfigMapsSpringBootTest.java
rename to spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MultipleConfigMapsTests.java
index 28ec49d1..4a544978 100644
--- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MultipleConfigMapsSpringBootTest.java
+++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MultipleConfigMapsTests.java
@@ -43,7 +43,7 @@ import org.springframework.test.web.reactive.server.WebTestClient;
 		classes = ExampleApp.class,
 		properties = { "spring.cloud.bootstrap.name=multiplecms" })
 @AutoConfigureWebTestClient
-public class MultipleConfigMapsSpringBootTest {
+public class MultipleConfigMapsTests {
 
 	@ClassRule
 	public static KubernetesServer server = new KubernetesServer();