diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/executor/ErrorHandlingExecutorBeanPostProcessorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/executor/ErrorHandlingExecutorBeanPostProcessorTests.java
index e5514c07ec..58457ab7f0 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/executor/ErrorHandlingExecutorBeanPostProcessorTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/executor/ErrorHandlingExecutorBeanPostProcessorTests.java
@@ -15,13 +15,16 @@
  */
 package org.springframework.integration.executor;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.aop.support.AopUtils;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.core.task.TaskExecutor;
@@ -29,48 +32,42 @@ import org.springframework.core.task.TaskExecutor;
 /**
  * 
  * @author Jonas Partner
- *
+ * 
  */
 public class ErrorHandlingExecutorBeanPostProcessorTests {
 
 	StubErrorHandler errorHandler;
-	
+
 	ApplicationContext applicationContext;
-	
+
 	@Before
-	public void setUp(){
-		applicationContext = new ClassPathXmlApplicationContext(getClass().getSimpleName()+"-context.xml", getClass());
-		errorHandler = (StubErrorHandler)applicationContext.getBean("stubErrorHandler");
+	public void setUp() {
+		applicationContext = new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-context.xml", getClass());
+		errorHandler = (StubErrorHandler) applicationContext.getBean("stubErrorHandler");
 	}
-	
+
 	@Test
-	public void testProxiedTaskExecutor() throws Exception{
-		TaskExecutor taskExecutor = (TaskExecutor)applicationContext.getBean("proxiedTaskExecutor");
-		ErrorThrowingRunnable runnable  = new ErrorThrowingRunnable();
+	public void testProxiedTaskExecutor() throws Exception {
+		errorHandler.latch = new CountDownLatch(1);
+		TaskExecutor taskExecutor = (TaskExecutor) applicationContext.getBean("proxiedTaskExecutor");
+		assertTrue("Task executor was not proxied ", AopUtils.isAopProxy(taskExecutor));
+		ErrorThrowingRunnable runnable = new ErrorThrowingRunnable();
 		taskExecutor.execute(runnable);
-		assertTrue("Runnable faield to run",runnable.latch.await(5, TimeUnit.SECONDS));
-		Thread.sleep(500);
+		assertTrue("Runnable faield to run", errorHandler.latch.await(5, TimeUnit.SECONDS));
 		assertEquals("Incorrect count of exceptions", 1, errorHandler.throwables.size());
 	}
-	
-	@Test
-	public void testExcludedFromProxyingTaskExecutor() throws Exception{
-		TaskExecutor taskExecutor = (TaskExecutor)applicationContext.getBean("excludeFromProxyingTaskExecutor");
-		ErrorThrowingRunnable runnable  = new ErrorThrowingRunnable();
-		taskExecutor.execute(runnable);
-		assertTrue("Runnable faield to run",runnable.latch.await(5, TimeUnit.SECONDS));
-		Thread.sleep(500);
-		assertEquals("Incorrect count of exceptions", 0, errorHandler.throwables.size());
-	}
-	
-	private static class ErrorThrowingRunnable implements Runnable{
 
-		CountDownLatch latch = new CountDownLatch(1);
-		
+	@Test
+	public void testExcludedFromProxyingTaskExecutor() throws Exception {
+		TaskExecutor taskExecutor = (TaskExecutor) applicationContext.getBean("excludeFromProxyingTaskExecutor");
+		assertFalse("Excluded task executor was proxied ", AopUtils.isAopProxy(taskExecutor));
+	}
+
+	private static class ErrorThrowingRunnable implements Runnable {
+
 		public void run() {
-			latch.countDown();
 			throw new RuntimeException();
 		}
-		
+
 	}
 }
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/executor/RunnableProxyingMethodInterceptorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/executor/RunnableProxyingMethodInterceptorTests.java
index 2d103227f5..843c5911cd 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/executor/RunnableProxyingMethodInterceptorTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/executor/RunnableProxyingMethodInterceptorTests.java
@@ -34,7 +34,7 @@ import org.springframework.integration.util.ErrorHandler;
 /**
  * 
  * @author Jonas Partner
- *
+ * 
  */
 public class RunnableProxyingMethodInterceptorTests {
 
@@ -52,28 +52,28 @@ public class RunnableProxyingMethodInterceptorTests {
 
 	@Test
 	public void testRuntimeThrown() throws Exception {
+		errorHandler.latch = new CountDownLatch(1);
 		TestRunnable runnable = new TestRunnable();
-
 		proxiedExecutor.execute(runnable);
-		assertTrue("Runnable did not run", runnable.countDown.await(5, TimeUnit.SECONDS));
-		Thread.sleep(500);
+		assertTrue("Runnable did not run", errorHandler.latch.await(5, TimeUnit.SECONDS));
 		assertEquals("Wrong count of exceptions in ErrorHandler", 1, errorHandler.throwables.size());
 	}
 
 	public static class StubErrorHandler implements ErrorHandler {
 
+		CountDownLatch latch;
+
 		List<Throwable> throwables = new ArrayList<Throwable>();
 
 		public void handle(Throwable t) {
+			latch.countDown();
 			throwables.add(t);
 		}
 	}
 
 	public static class TestRunnable implements Runnable {
-		CountDownLatch countDown = new CountDownLatch(1);
 
 		public void run() {
-			countDown.countDown();
 			throw new RuntimeException();
 		}
 	}
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/executor/StubErrorHandler.java b/org.springframework.integration/src/test/java/org/springframework/integration/executor/StubErrorHandler.java
index 3edcb13468..9deba0d85a 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/executor/StubErrorHandler.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/executor/StubErrorHandler.java
@@ -17,15 +17,19 @@ package org.springframework.integration.executor;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
 
 import org.springframework.integration.util.ErrorHandler;
 
 public class StubErrorHandler implements ErrorHandler {
 
-	volatile List<Throwable> throwables = new ArrayList<Throwable>();
+	CountDownLatch latch;
+	
+	List<Throwable> throwables = new ArrayList<Throwable>();
 	
 	public void handle(Throwable t) {
 		throwables.add(t);
+		latch.countDown();
 	}