diff --git a/build.gradle b/build.gradle
index b2b6045..3e365fa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -223,6 +223,7 @@ ext {
 			"amqp14"           : [springAmqpVersion: "1.4.6.RELEASE"],
 			"amqp15"           : [springAmqpVersion: "1.5.6.RELEASE"],
 			"amqp16"           : [springAmqpVersion: "1.6.0.RELEASE"],
+			"amqp20"           : [springAmqpVersion: "2.0.0.RELEASE"],
 			"spring32"         : [springVersion: "3.2.17.RELEASE"],
 			"spring40"         : [springVersion: "4.0.9.RELEASE"],
 			"spring41"         : [springVersion: "4.1.9.RELEASE"],
diff --git a/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitConnectionFactoryCreatorTest.java b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitConnectionFactoryCreatorTest.java
index 95a5f1b..3a90bb2 100644
--- a/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitConnectionFactoryCreatorTest.java
+++ b/spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitConnectionFactoryCreatorTest.java
@@ -76,8 +76,8 @@ public class RabbitConnectionFactoryCreatorTest {
 		com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory =
 				(com.rabbitmq.client.ConnectionFactory) ReflectionTestUtils.getField(connector, "rabbitConnectionFactory");
 		String[] userInfo = uri.getRawUserInfo().split(":");
-		assertEquals(userInfo[0], ReflectionTestUtils.getField(rabbitConnectionFactory, "username"));
-		assertEquals(userInfo[1], ReflectionTestUtils.getField(rabbitConnectionFactory, "password"));
+		assertEquals(userInfo[0], rabbitConnectionFactory.getUsername());
+		assertEquals(userInfo[1], rabbitConnectionFactory.getPassword());
 
 		assertTrue(uri.getPath().endsWith(connector.getVirtualHost()));
 	}