diff --git a/spring-integration-core/src/test/java/org/springframework/integration/support/management/micrometer/MicrometerCustomMetricsTests.java b/spring-integration-core/src/test/java/org/springframework/integration/support/management/micrometer/MicrometerCustomMetricsTests.java
index d1f0557793..27a7b72d8b 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/support/management/micrometer/MicrometerCustomMetricsTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/support/management/micrometer/MicrometerCustomMetricsTests.java
@@ -31,7 +31,9 @@ import org.springframework.integration.config.EnableIntegration;
 import org.springframework.integration.config.EnableIntegrationManagement;
 import org.springframework.integration.support.management.metrics.MetricsCaptor;
 import org.springframework.messaging.support.GenericMessage;
+import org.springframework.test.context.TestExecutionListeners;
 import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
 
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.search.MeterNotFoundException;
@@ -39,11 +41,13 @@ import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 
 /**
  * @author Gary Russell
+ * @author Artem Bilan
  *
  * @since 5.1
  *
  */
 @RunWith(SpringRunner.class)
+@TestExecutionListeners(DependencyInjectionTestExecutionListener.class)
 public class MicrometerCustomMetricsTests {
 
 	@Autowired
@@ -56,7 +60,7 @@ public class MicrometerCustomMetricsTests {
 	private QueueChannel queue;
 
 	@Test
-	public void testSend() throws Exception {
+	public void testSend() {
 		GenericMessage<String> message = new GenericMessage<>("foo");
 		this.queue.send(message);
 		this.queue.receive();
@@ -112,6 +116,7 @@ public class MicrometerCustomMetricsTests {
 		public MetricsCaptor captor() {
 			return new CustomMetricsCaptor(meterRegistry());
 		}
+
 	}
 
 	static class CustomMetricsCaptor extends MicrometerMetricsCaptor {
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/support/management/micrometer/MicrometerMetricsTests.java b/spring-integration-core/src/test/java/org/springframework/integration/support/management/micrometer/MicrometerMetricsTests.java
index d2283f238c..d747fff3e0 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/support/management/micrometer/MicrometerMetricsTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/support/management/micrometer/MicrometerMetricsTests.java
@@ -49,7 +49,9 @@ import org.springframework.messaging.MessagingException;
 import org.springframework.messaging.PollableChannel;
 import org.springframework.messaging.support.GenericMessage;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.TestExecutionListeners;
 import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
 
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.search.MeterNotFoundException;
@@ -57,12 +59,14 @@ import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 
 /**
  * @author Gary Russell
+ * @author Artem Bilan
  *
  * @since 5.0.2
  *
  */
 @RunWith(SpringRunner.class)
 @DirtiesContext
+@TestExecutionListeners(DependencyInjectionTestExecutionListener.class)
 public class MicrometerMetricsTests {
 
 	@Autowired
@@ -91,7 +95,7 @@ public class MicrometerMetricsTests {
 
 	@SuppressWarnings("unchecked")
 	@Test
-	public void testSend() throws Exception {
+	public void testSend() {
 		GenericMessage<String> message = new GenericMessage<>("foo");
 		this.channel.send(message);
 		try {
@@ -186,15 +190,15 @@ public class MicrometerMetricsTests {
 
 		// Test meter removal
 		registry.get("spring.integration.send")
-			.tag("name", "newChannel")
-			.tag("result", "success")
-			.timer();
-		newChannel.destroy();
-		try {
-			registry.get("spring.integration.send")
 				.tag("name", "newChannel")
 				.tag("result", "success")
 				.timer();
+		newChannel.destroy();
+		try {
+			registry.get("spring.integration.send")
+					.tag("name", "newChannel")
+					.tag("result", "success")
+					.timer();
 			fail("Expected MeterNotFoundException");
 		}
 		catch (MeterNotFoundException e) {
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpConfigInboundGatewayTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpConfigInboundGatewayTests.java
index b36ceef838..6d7812c7d4 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpConfigInboundGatewayTests.java
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpConfigInboundGatewayTests.java
@@ -25,33 +25,27 @@ import java.net.Socket;
 
 import javax.net.SocketFactory;
 
-import org.junit.AfterClass;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.integration.ip.tcp.connection.AbstractClientConnectionFactory;
 import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory;
 import org.springframework.integration.ip.tcp.serializer.ByteArrayStxEtxSerializer;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
 
 /**
  * @author Gary Russell
+ * @author Artem Bilan
+ *
  * @since 2.0
  */
-@ContextConfiguration
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
+@DirtiesContext
 public class TcpConfigInboundGatewayTests {
 
-	static AbstractApplicationContext staticContext;
-
-	@Autowired
-	AbstractApplicationContext ctx;
-
 	@Autowired
 	@Qualifier("crLfServer")
 	AbstractServerConnectionFactory crLfServer;
@@ -288,16 +282,4 @@ public class TcpConfigInboundGatewayTests {
 
 	}
 
-	@Before
-	public void copyContext() {
-		if (staticContext == null) {
-			staticContext = ctx;
-		}
-	}
-
-	@AfterClass
-	public static void shutDown() {
-		staticContext.close();
-	}
-
 }
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundChannelAdapterWithinChainTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundChannelAdapterWithinChainTests.java
index 95db2e5f22..e83c64ade9 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundChannelAdapterWithinChainTests.java
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundChannelAdapterWithinChainTests.java
@@ -24,29 +24,23 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.integration.jdbc.storedproc.User;
 import org.springframework.integration.support.MessageBuilder;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 /**
  * @author Artem Bilan
  *
  * @since 2.2
  */
-@ContextConfiguration
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @DirtiesContext // close at the end after class
 public class StoredProcOutboundChannelAdapterWithinChainTests {
 
-	@Autowired
-	private AbstractApplicationContext context;
-
 	@Autowired
 	private JdbcTemplate jdbcTemplate;
 
@@ -64,9 +58,6 @@ public class StoredProcOutboundChannelAdapterWithinChainTests {
 		assertThat(map.get("USERNAME")).as("Wrong username").isEqualTo("username");
 		assertThat(map.get("PASSWORD")).as("Wrong password").isEqualTo("password");
 		assertThat(map.get("EMAIL")).as("Wrong email").isEqualTo("email");
-//		embeddedDatabase can be in working state. So other tests with the same embeddedDatabase beanId, type and init scripts
-//		may be failed with Exception like: object in the DB already exists
-		this.context.close();
 	}
 
 }