diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java
index 7dc54b3bf8..71b6545b1e 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java
@@ -18,7 +18,6 @@ package org.springframework.boot.autoconfigure.amqp;
 
 import java.security.NoSuchAlgorithmException;
 
-import javax.net.SocketFactory;
 import javax.net.ssl.SSLSocketFactory;
 
 import com.rabbitmq.client.Address;
@@ -522,9 +521,8 @@ public class RabbitAutoConfigurationTests {
 				.run((context) -> {
 					com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory = getTargetConnectionFactory(
 							context);
-					assertThat(rabbitConnectionFactory.getSocketFactory())
-							.as("Must use default SocketFactory")
-							.isEqualTo(SocketFactory.getDefault());
+					assertThat(rabbitConnectionFactory.getSocketFactory()).isNull();
+					assertThat(rabbitConnectionFactory.isSSL()).isFalse();
 				});
 	}
 
@@ -534,6 +532,7 @@ public class RabbitAutoConfigurationTests {
 				.withPropertyValues("spring.rabbitmq.ssl.enabled:true").run((context) -> {
 					com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory = getTargetConnectionFactory(
 							context);
+					assertThat(rabbitConnectionFactory.isSSL()).isTrue();
 					assertThat(rabbitConnectionFactory.getSocketFactory())
 							.as("SocketFactory must use SSL")
 							.isInstanceOf(SSLSocketFactory.class);
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index b835889be5..e43f56143b 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -164,7 +164,7 @@
 		<snakeyaml.version>1.18</snakeyaml.version>
 		<solr.version>6.6.1</solr.version>
 		<spring.version>5.0.0.BUILD-SNAPSHOT</spring.version>
-		<spring-amqp.version>2.0.0.RC1</spring-amqp.version>
+		<spring-amqp.version>2.0.0.BUILD-SNAPSHOT</spring-amqp.version>
 		<spring-cloud-connectors.version>2.0.0.M1</spring-cloud-connectors.version>
 		<spring-batch.version>4.0.0.M3</spring-batch.version>
 		<spring-data-releasetrain.version>Kay-RC3</spring-data-releasetrain.version>