diff --git a/build.gradle b/build.gradle
index 6a3ef123b4..5c210f4574 100644
--- a/build.gradle
+++ b/build.gradle
@@ -78,11 +78,9 @@ subprojects { subproject ->
 	}
 
 	compileTestJava {
-		sourceCompatibility = 1.6
-		targetCompatibility = 1.6
+		sourceCompatibility = 1.8
 	}
 
-
 	ext {
 		activeMqVersion = '5.13.2'
 		aspectjVersion = '1.8.9'
@@ -129,7 +127,7 @@ subprojects { subproject ->
 		slf4jVersion = "1.7.21"
 		tomcatVersion = "8.0.33"
 		smackVersion = '4.1.7'
-		springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '1.6.2.RELEASE'
+		springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '1.6.3.RELEASE'
 		springDataJpaVersion = '1.10.1.RELEASE'
 		springDataMongoVersion = '1.9.1.RELEASE'
 		springDataRedisVersion = '1.7.1.RELEASE'
@@ -289,11 +287,6 @@ project('spring-integration-amqp') {
 project('spring-integration-core') {
 	description = 'Spring Integration Core'
 
-	compileTestJava {
-		sourceCompatibility = 1.8
-		targetCompatibility = 1.8
-	}
-
 	dependencies {
 		compile "org.springframework:spring-core:$springVersion"
 		compile "org.springframework:spring-aop:$springVersion"