diff --git a/build.gradle b/build.gradle
index 6b16f59..5024f53 100644
--- a/build.gradle
+++ b/build.gradle
@@ -175,7 +175,8 @@ ext {
 			"jedis29-redis20"   : [jedisVersion: "2.9.0", springDataRedisVersion: "2.0.0.RELEASE"],
 			"lettuce5-redis20"  : [lettuceVersion: "5.0.0.RELEASE", springDataRedisVersion: "2.0.0.RELEASE"],
 			"driver330-cass20"  : [cassandraDriverVersion: "3.3.0", springDataCassandraVersion: "2.0.0.RELEASE"],
-			"amqp20"            : [springAmqpVersion: "2.0.0.RELEASE"],
+			"amqp200"           : [springAmqpVersion: "2.0.0.RELEASE"],
+			"amqp205-rabbit541" : [springAmqpVersion: "2.0.5.RELEASE", "rabbitClientVersion": "5.4.1"],
 			"spring50"          : [springVersion: "5.0.0.RELEASE"],
 			"tomcat85"          : [tomcatVersion: "8.5.13"],
 	]
diff --git a/spring-cloud-spring-service-connector/build.gradle b/spring-cloud-spring-service-connector/build.gradle
index ad86f53..e3d1ae6 100644
--- a/spring-cloud-spring-service-connector/build.gradle
+++ b/spring-cloud-spring-service-connector/build.gradle
@@ -5,6 +5,7 @@ ext {
 	tomcatVersion = "8.5.13"
 
 	springAmqpVersion = "2.0.0.RELEASE"
+	rabbitClientVersion = "5.0.0"
 
 	springDataMongoVersion = "2.0.0.RELEASE"
 	mongoDriverVersion = "3.4.2"
@@ -50,6 +51,7 @@ dependencies {
 	optional("com.zaxxer:HikariCP:${hikariCpVersion}")
 
 	optional("org.springframework.amqp:spring-rabbit:$springAmqpVersion")
+	optional("com.rabbitmq:amqp-client:$rabbitClientVersion")
 
 	optional("org.springframework.data:spring-data-redis:$springDataRedisVersion") {
 		exclude(group: 'org.springframework', module: 'spring-context-support')
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()));
 	}