diff --git a/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/event/ZookeeperLeaderTests.java b/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/event/ZookeeperLeaderTests.java
index b66feaee005..e965382cc9b 100644
--- a/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/event/ZookeeperLeaderTests.java
+++ b/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/event/ZookeeperLeaderTests.java
@@ -24,6 +24,7 @@
 
 import java.util.Collections;
 import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
@@ -62,6 +63,8 @@ public class ZookeeperLeaderTests extends ZookeeperTestSupport {
 	private final SmartLifecycleRoleController controller = new SmartLifecycleRoleController(
 			Collections.singletonList("sitest"), Collections.<SmartLifecycle>singletonList(this.adapter));
 
+	private final CountDownLatch yieldBarrier = new CountDownLatch(1);
+
 	@Test
 	public void testLeader() throws Exception {
 		assertFalse(this.adapter.isRunning());
@@ -87,6 +90,8 @@ public void testLeader() throws Exception {
 
 		assertFalse(this.adapter.isRunning());
 
+		this.yieldBarrier.countDown();
+
 		event = this.events.poll(30, TimeUnit.SECONDS);
 		assertNotNull(event);
 		assertThat(event, instanceOf(OnGrantedEvent.class));
@@ -105,6 +110,8 @@ public void testLeader() throws Exception {
 	private LeaderEventPublisher publisher() {
 		return new DefaultLeaderEventPublisher(new ApplicationEventPublisher() {
 
+			volatile boolean onRevokedEventHappened;
+
 			@Override
 			public void publishEvent(Object event) {
 			}
@@ -112,6 +119,16 @@ public void publishEvent(Object event) {
 			@Override
 			public void publishEvent(ApplicationEvent event) {
 				AbstractLeaderEvent leadershipEvent = (AbstractLeaderEvent) event;
+				if (this.onRevokedEventHappened) {
+					try {
+						yieldBarrier.await(10, TimeUnit.SECONDS);
+					}
+					catch (InterruptedException e) {
+						Thread.currentThread().interrupt();
+						throw new RuntimeException(e);
+					}
+				}
+				onRevokedEventHappened = event instanceof OnRevokedEvent;
 				controller.onApplicationEvent((AbstractLeaderEvent) event);
 				events.add(leadershipEvent);
 			}