diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/ScheduledMessageProducer.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/ScheduledMessageProducer.java
index 4c597b1fba..c069182774 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/ScheduledMessageProducer.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/ScheduledMessageProducer.java
@@ -25,8 +25,8 @@ import org.springframework.expression.Expression;
 import org.springframework.expression.ExpressionParser;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
-import org.springframework.integration.context.SimpleBeanResolver;
 import org.springframework.integration.support.MessageBuilder;
+import org.springframework.integration.util.SimpleBeanResolver;
 import org.springframework.scheduling.Trigger;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapper.java
index 9871103d5f..9683080c61 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapper.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapper.java
@@ -37,9 +37,9 @@ import org.springframework.integration.MessagingException;
 import org.springframework.integration.annotation.Header;
 import org.springframework.integration.annotation.Headers;
 import org.springframework.integration.annotation.Payload;
-import org.springframework.integration.context.SimpleBeanResolver;
 import org.springframework.integration.mapping.InboundMessageMapper;
 import org.springframework.integration.support.MessageBuilder;
+import org.springframework.integration.util.SimpleBeanResolver;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/AbstractExpressionEvaluator.java b/spring-integration-core/src/main/java/org/springframework/integration/util/AbstractExpressionEvaluator.java
index f06606b329..f6ec55f759 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/util/AbstractExpressionEvaluator.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/util/AbstractExpressionEvaluator.java
@@ -27,7 +27,6 @@ import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.integration.Message;
 import org.springframework.integration.MessageHandlingException;
-import org.springframework.integration.context.SimpleBeanResolver;
 
 /**
  * @author Mark Fisher
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/context/SimpleBeanResolver.java b/spring-integration-core/src/main/java/org/springframework/integration/util/SimpleBeanResolver.java
similarity index 96%
rename from spring-integration-core/src/main/java/org/springframework/integration/context/SimpleBeanResolver.java
rename to spring-integration-core/src/main/java/org/springframework/integration/util/SimpleBeanResolver.java
index 7517294cad..fcdc331b52 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/context/SimpleBeanResolver.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/util/SimpleBeanResolver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.context;
+package org.springframework.integration.util;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.expression.AccessException;
diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java b/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java
index eb6ee2011e..e7a6249639 100755
--- a/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java
+++ b/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java
@@ -42,11 +42,11 @@ import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.integration.Message;
 import org.springframework.integration.MessageHandlingException;
 import org.springframework.integration.MessagingException;
-import org.springframework.integration.context.SimpleBeanResolver;
 import org.springframework.integration.core.MessageHandler;
 import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
 import org.springframework.integration.mapping.HeaderMapper;
 import org.springframework.integration.support.MessageBuilder;
+import org.springframework.integration.util.SimpleBeanResolver;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.client.ResponseErrorHandler;