diff --git a/build.gradle b/build.gradle
index 02a447d..0b8cc4c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,10 +33,11 @@ repositories {
 ext {
 	assertjVersion = '3.9.1'
 	dynamodbLockClientVersion = '1.0.0'
+	jacksonVersion = '2.9.5'
 	servletApiVersion = '3.1.0'
 	log4jVersion = '2.11.0'
-	springCloudAwsVersion = '2.0.0.RC2'
-	springIntegrationVersion = '5.0.6.BUILD-SNAPSHOT'
+	springCloudAwsVersion = '2.0.0.BUILD-SNAPSHOT'
+	springIntegrationVersion = '5.0.6.RELEASE'
 
 	idPrefix = 'aws'
 
@@ -97,6 +98,9 @@ checkstyle {
 
 dependencies {
 	compile 'org.springframework.integration:spring-integration-core'
+
+	compile("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion", optional)
+
 	compile 'org.springframework.cloud:spring-cloud-aws-core'
 
 	compile('org.springframework.cloud:spring-cloud-aws-messaging', optional)
diff --git a/src/test/java/org/springframework/integration/aws/inbound/SqsMessageDrivenChannelAdapterTests.java b/src/test/java/org/springframework/integration/aws/inbound/SqsMessageDrivenChannelAdapterTests.java
index df5dd74..e2cf7fd 100644
--- a/src/test/java/org/springframework/integration/aws/inbound/SqsMessageDrivenChannelAdapterTests.java
+++ b/src/test/java/org/springframework/integration/aws/inbound/SqsMessageDrivenChannelAdapterTests.java
@@ -126,7 +126,8 @@ public class SqsMessageDrivenChannelAdapterTests {
 			given(sqs.receiveMessage(new ReceiveMessageRequest("http://testQueue.amazonaws.com")
 					.withAttributeNames("All")
 					.withMessageAttributeNames("All")
-					.withMaxNumberOfMessages(10)))
+					.withMaxNumberOfMessages(10)
+					.withWaitTimeSeconds(20)))
 					.willReturn(new ReceiveMessageResult()
 							.withMessages(new Message().withBody("messageContent"),
 									new Message().withBody("messageContent2")))
diff --git a/src/test/java/org/springframework/integration/aws/kinesis/KinesisIntegrationTests.java b/src/test/java/org/springframework/integration/aws/kinesis/KinesisIntegrationTests.java
index 8545d8b..e5493d9 100644
--- a/src/test/java/org/springframework/integration/aws/kinesis/KinesisIntegrationTests.java
+++ b/src/test/java/org/springframework/integration/aws/kinesis/KinesisIntegrationTests.java
@@ -48,7 +48,7 @@ import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHandler;
 import org.springframework.messaging.PollableChannel;
-import org.springframework.messaging.support.ChannelInterceptorAdapter;
+import org.springframework.messaging.support.ChannelInterceptor;
 import org.springframework.messaging.support.ErrorMessage;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -195,16 +195,15 @@ public class KinesisIntegrationTests {
 		@Bean
 		public PollableChannel errorChannel() {
 			QueueChannel queueChannel = new QueueChannel();
-			queueChannel.addInterceptor(new ChannelInterceptorAdapter() {
+			queueChannel.addInterceptor(new ChannelInterceptor() {
 
 				@Override
 				public void postSend(Message<?> message, MessageChannel channel, boolean sent) {
-					super.postSend(message, channel, sent);
-
 					if (message instanceof ErrorMessage) {
 						throw (RuntimeException) ((ErrorMessage) message).getPayload();
 					}
 				}
+
 			});
 			return queueChannel;
 		}