diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java
index f93ef9ff35..56baf86be1 100644
--- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java
+++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java
@@ -176,7 +176,7 @@ public class AmqpInboundChannelAdapter extends MessageProducerSupport implements
 			AttributeAccessor attributes = attributesHolder.get();
 			if (attributes != null) {
 				attributes.setAttribute(ErrorMessageUtils.INPUT_MESSAGE_CONTEXT_KEY, message);
-				attributes.setAttribute(AmqpMessageHeaderErrorMessageStrategy.AMQP_MESSAGE, amqpMessage);
+				attributes.setAttribute(AmqpMessageHeaderErrorMessageStrategy.AMQP_RAW_MESSAGE, amqpMessage);
 			}
 		}
 	}
diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java
index 8022c8f768..be06eb6c6e 100644
--- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java
+++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java
@@ -233,7 +233,7 @@ public class AmqpInboundGateway extends MessagingGatewaySupport {
 			AttributeAccessor attributes = attributesHolder.get();
 			if (attributes != null) {
 				attributes.setAttribute(ErrorMessageUtils.INPUT_MESSAGE_CONTEXT_KEY, message);
-				attributes.setAttribute(AmqpMessageHeaderErrorMessageStrategy.AMQP_MESSAGE, amqpMessage);
+				attributes.setAttribute(AmqpMessageHeaderErrorMessageStrategy.AMQP_RAW_MESSAGE, amqpMessage);
 			}
 		}
 	}
diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/InboundEndpointTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/InboundEndpointTests.java
index 0d2f4c0a5a..aa5843a826 100644
--- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/InboundEndpointTests.java
+++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/InboundEndpointTests.java
@@ -324,7 +324,7 @@ public class InboundEndpointTests {
 		assertThat(errorMessage.getPayload(), instanceOf(MessagingException.class));
 		assertThat(((MessagingException) errorMessage.getPayload()).getMessage(), containsString("Dispatcher has no"));
 		org.springframework.amqp.core.Message amqpMessage = errorMessage.getHeaders()
-				.get(AmqpMessageHeaderErrorMessageStrategy.AMQP_MESSAGE, org.springframework.amqp.core.Message.class);
+				.get(AmqpMessageHeaderErrorMessageStrategy.AMQP_RAW_MESSAGE, org.springframework.amqp.core.Message.class);
 		assertThat(amqpMessage, notNullValue());
 		assertNull(errors.receive(0));
 	}
@@ -349,7 +349,7 @@ public class InboundEndpointTests {
 		assertThat(errorMessage.getPayload(), instanceOf(MessagingException.class));
 		assertThat(((MessagingException) errorMessage.getPayload()).getMessage(), containsString("Dispatcher has no"));
 		org.springframework.amqp.core.Message amqpMessage = errorMessage.getHeaders()
-				.get(AmqpMessageHeaderErrorMessageStrategy.AMQP_MESSAGE, org.springframework.amqp.core.Message.class);
+				.get(AmqpMessageHeaderErrorMessageStrategy.AMQP_RAW_MESSAGE, org.springframework.amqp.core.Message.class);
 		assertThat(amqpMessage, notNullValue());
 		assertNull(errors.receive(0));
 	}