diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java
index d0c500f12c..37068dfd62 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java
@@ -20,8 +20,8 @@ import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.integration.dispatcher.BroadcastingDispatcher;
-import org.springframework.integration.executor.ErrorHandlingTaskExecutor;
 import org.springframework.integration.util.ErrorHandler;
+import org.springframework.integration.util.ErrorHandlingTaskExecutor;
 
 /**
  * A channel that sends Messages to each of its subscribers. 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java
index af07269299..77c1e9548b 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java
@@ -28,10 +28,10 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.integration.channel.BeanFactoryChannelResolver;
 import org.springframework.integration.channel.MessagePublishingErrorHandler;
-import org.springframework.integration.executor.ErrorHandlingTaskExecutor;
 import org.springframework.integration.scheduling.IntervalTrigger;
 import org.springframework.integration.scheduling.Trigger;
 import org.springframework.integration.util.ErrorHandler;
+import org.springframework.integration.util.ErrorHandlingTaskExecutor;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionStatus;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/executor/ErrorHandlingTaskExecutor.java b/org.springframework.integration/src/main/java/org/springframework/integration/util/ErrorHandlingTaskExecutor.java
similarity index 93%
rename from org.springframework.integration/src/main/java/org/springframework/integration/executor/ErrorHandlingTaskExecutor.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/util/ErrorHandlingTaskExecutor.java
index b9eafc43dd..534ec3a7db 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/executor/ErrorHandlingTaskExecutor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/util/ErrorHandlingTaskExecutor.java
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.executor;
+package org.springframework.integration.util;
 
 import org.springframework.core.task.TaskExecutor;
-import org.springframework.integration.util.ErrorHandler;
 import org.springframework.util.Assert;
 
 /**
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java
index 0707f2779e..513c2476d4 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java
@@ -35,11 +35,11 @@ import org.springframework.integration.config.TestChannelInterceptor;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessageChannel;
 import org.springframework.integration.core.MessagePriority;
-import org.springframework.integration.executor.ErrorHandlingTaskExecutor;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.integration.message.MessageDeliveryException;
 import org.springframework.integration.message.StringMessage;
+import org.springframework.integration.util.ErrorHandlingTaskExecutor;
 
 /**
  * @author Mark Fisher
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/PublishSubscribeChannelParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/PublishSubscribeChannelParserTests.java
index 160e3fe32d..9edefc9b89 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/PublishSubscribeChannelParserTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/PublishSubscribeChannelParserTests.java
@@ -29,8 +29,8 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.integration.channel.PublishSubscribeChannel;
 import org.springframework.integration.dispatcher.BroadcastingDispatcher;
-import org.springframework.integration.executor.ErrorHandlingTaskExecutor;
 import org.springframework.integration.util.ErrorHandler;
+import org.springframework.integration.util.ErrorHandlingTaskExecutor;
 
 /**
  * @author Mark Fisher