diff --git a/applications/stream-applications-core/stream-applications-micrometer-common/pom.xml b/applications/stream-applications-core/stream-applications-micrometer-common/pom.xml
index 85c02c89..8322727a 100644
--- a/applications/stream-applications-core/stream-applications-micrometer-common/pom.xml
+++ b/applications/stream-applications-core/stream-applications-micrometer-common/pom.xml
@@ -15,19 +15,19 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>stream-applications-micrometer-common</artifactId>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>
-                        -javaagent:"${settings.localRepository}"/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar
-                    </argLine>
-                </configuration>
-            </plugin>
-        </plugins>
+<!--    <build>-->
+<!--        <plugins>-->
+<!--            <plugin>-->
+<!--                <artifactId>maven-surefire-plugin</artifactId>-->
+<!--                <configuration>-->
+<!--                    <argLine>-->
+<!--                        -javaagent:"${settings.localRepository}"/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar-->
+<!--                    </argLine>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
+<!--        </plugins>-->
 
-    </build>
+<!--    </build>-->
 
     <dependencies>
         <dependency>
@@ -60,6 +60,16 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <optional>true</optional>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
-
 </project>
diff --git a/applications/stream-applications-core/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerActiveCloudProfile.java b/applications/stream-applications-core/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerActiveCloudProfile.java
new file mode 100644
index 00000000..bc03b8f2
--- /dev/null
+++ b/applications/stream-applications-core/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerActiveCloudProfile.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2018-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.stream.app.micrometer.common;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.TestPropertySource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Christian Tzolov
+ */
+@TestPropertySource(properties = {
+		"vcap.application.org_name=PivotalOrg",
+		"vcap.application.space_id=SpringSpaceId",
+		"vcap.application.space_name=SpringSpace",
+		"vcap.application.application_name=App666",
+		"vcap.application.application_id=666guid",
+		"vcap.application.application_version=2.0",
+		"vcap.application.instance_index=123" })
+@ActiveProfiles("cloud")
+public class CloudFoundryMicrometerActiveCloudProfile extends AbstractMicrometerTagTest {
+
+	@Test
+	public void testPresetTagValues() {
+		assertThat(meter.getId().getTag("cf.org.name")).isEqualTo("PivotalOrg");
+		assertThat(meter.getId().getTag("cf.space.id")).isEqualTo("SpringSpaceId");
+		assertThat(meter.getId().getTag("cf.space.name")).isEqualTo("SpringSpace");
+		assertThat(meter.getId().getTag("cf.app.name")).isEqualTo("App666");
+		assertThat(meter.getId().getTag("cf.app.id")).isEqualTo("666guid");
+		assertThat(meter.getId().getTag("cf.app.version")).isEqualTo("2.0");
+		assertThat(meter.getId().getTag("cf.instance.index")).isEqualTo("123");
+	}
+}
diff --git a/applications/stream-applications-core/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerActiveCloudProfileDefaultValues.java b/applications/stream-applications-core/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerActiveCloudProfileDefaultValues.java
new file mode 100644
index 00000000..cf36b257
--- /dev/null
+++ b/applications/stream-applications-core/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerActiveCloudProfileDefaultValues.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2018-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.stream.app.micrometer.common;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.test.context.ActiveProfiles;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Christian Tzolov
+ */
+@ActiveProfiles("cloud")
+public class CloudFoundryMicrometerActiveCloudProfileDefaultValues extends AbstractMicrometerTagTest {
+	@Test
+	public void testDefaultTagValues() {
+		assertThat(meter.getId().getTag("cf.org.name")).isEqualTo("default");
+		assertThat(meter.getId().getTag("cf.space.id")).isEqualTo("unknown");
+		assertThat(meter.getId().getTag("cf.space.name")).isEqualTo("unknown");
+		assertThat(meter.getId().getTag("cf.app.name")).isEqualTo("unknown");
+		assertThat(meter.getId().getTag("cf.app.id")).isEqualTo("unknown");
+		assertThat(meter.getId().getTag("cf.app.version")).isEqualTo("unknown");
+		assertThat(meter.getId().getTag("cf.instance.index")).isEqualTo("0");
+	}
+}
diff --git a/applications/stream-applications-core/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerCommonTagsTest.java b/applications/stream-applications-core/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerCommonTagsTest.java
deleted file mode 100644
index 94733d0c..00000000
--- a/applications/stream-applications-core/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerCommonTagsTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2018-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-//package org.springframework.cloud.stream.app.micrometer.common;
-//
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
-//
-//import org.springframework.test.context.ActiveProfiles;
-//import org.springframework.test.context.TestPropertySource;
-//
-//import static org.assertj.core.api.Assertions.assertThat;
-//
-///**
-// * @author Christian Tzolov
-// */
-//@RunWith(Enclosed.class)
-//public class CloudFoundryMicrometerCommonTagsTest {
-//
-//	@ActiveProfiles("cloud")
-//	public static class ActiveCloudProfileDefaultValues extends AbstractMicrometerTagTest {
-//		@Test
-//		public void testDefaultTagValues() {
-//			assertThat(meter.getId().getTag("cf.org.name")).isEqualTo("default");
-//			assertThat(meter.getId().getTag("cf.space.id")).isEqualTo("unknown");
-//			assertThat(meter.getId().getTag("cf.space.name")).isEqualTo("unknown");
-//			assertThat(meter.getId().getTag("cf.app.name")).isEqualTo("unknown");
-//			assertThat(meter.getId().getTag("cf.app.id")).isEqualTo("unknown");
-//			assertThat(meter.getId().getTag("cf.app.version")).isEqualTo("unknown");
-//			assertThat(meter.getId().getTag("cf.instance.index")).isEqualTo("0");
-//		}
-//	}
-//
-//	@TestPropertySource(properties = {
-//			"vcap.application.org_name=PivotalOrg",
-//			"vcap.application.space_id=SpringSpaceId",
-//			"vcap.application.space_name=SpringSpace",
-//			"vcap.application.application_name=App666",
-//			"vcap.application.application_id=666guid",
-//			"vcap.application.application_version=2.0",
-//			"vcap.application.instance_index=123"})
-//	@ActiveProfiles("cloud")
-//	public static class ActiveCloudProfile extends AbstractMicrometerTagTest {
-//
-//		@Test
-//		public void testPresetTagValues() {
-//			assertThat(meter.getId().getTag("cf.org.name")).isEqualTo("PivotalOrg");
-//			assertThat(meter.getId().getTag("cf.space.id")).isEqualTo("SpringSpaceId");
-//			assertThat(meter.getId().getTag("cf.space.name")).isEqualTo("SpringSpace");
-//			assertThat(meter.getId().getTag("cf.app.name")).isEqualTo("App666");
-//			assertThat(meter.getId().getTag("cf.app.id")).isEqualTo("666guid");
-//			assertThat(meter.getId().getTag("cf.app.version")).isEqualTo("2.0");
-//			assertThat(meter.getId().getTag("cf.instance.index")).isEqualTo("123");
-//		}
-//	}
-//
-//	@TestPropertySource(properties = {
-//			"vcap.application.org_name=PivotalOrg",
-//			"vcap.application.space_id=SpringSpaceId",
-//			"vcap.application.space_name=SpringSpace",
-//			"vcap.application.application_name=App666",
-//			"vcap.application.application_id=666guid",
-//			"vcap.application.application_version=2.0",
-//			"vcap.application.instance_index=123"})
-//	public static class InactiveCloudProfile extends AbstractMicrometerTagTest {
-//
-//		@Test
-//		public void testDisabledTagValues() {
-//			assertThat(meter.getId().getTag("cf.org.name")).isNull();
-//			assertThat(meter.getId().getTag("cf.space.id")).isNull();
-//			assertThat(meter.getId().getTag("cf.space.name")).isNull();
-//			assertThat(meter.getId().getTag("cf.app.name")).isNull();
-//			assertThat(meter.getId().getTag("cf.app.id")).isNull();
-//			assertThat(meter.getId().getTag("cf.app.version")).isNull();
-//			assertThat(meter.getId().getTag("cf.instance.index")).isNull();
-//		}
-//	}
-//
-//	@TestPropertySource(properties = {"spring.cloud.stream.app.metrics.cf.tags.enabled=false"})
-//	@ActiveProfiles("cloud")
-//	public static class ActiveCloudProfileDisabledProperty extends InactiveCloudProfile {
-//	}
-//}
-//
diff --git a/applications/stream-applications-core/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerInactiveCloudProfile.java b/applications/stream-applications-core/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerInactiveCloudProfile.java
new file mode 100644
index 00000000..063942f1
--- /dev/null
+++ b/applications/stream-applications-core/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerInactiveCloudProfile.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2018-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.stream.app.micrometer.common;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.test.context.TestPropertySource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Christian Tzolov
+ */
+@TestPropertySource(properties = {
+		"vcap.application.org_name=PivotalOrg",
+		"vcap.application.space_id=SpringSpaceId",
+		"vcap.application.space_name=SpringSpace",
+		"vcap.application.application_name=App666",
+		"vcap.application.application_id=666guid",
+		"vcap.application.application_version=2.0",
+		"vcap.application.instance_index=123" })
+public class CloudFoundryMicrometerInactiveCloudProfile extends AbstractMicrometerTagTest {
+
+	@Test
+	public void testDisabledTagValues() {
+		assertThat(meter.getId().getTag("cf.org.name")).isNull();
+		assertThat(meter.getId().getTag("cf.space.id")).isNull();
+		assertThat(meter.getId().getTag("cf.space.name")).isNull();
+		assertThat(meter.getId().getTag("cf.app.name")).isNull();
+		assertThat(meter.getId().getTag("cf.app.id")).isNull();
+		assertThat(meter.getId().getTag("cf.app.version")).isNull();
+		assertThat(meter.getId().getTag("cf.instance.index")).isNull();
+	}
+}