diff --git a/spring-rabbit-junit/src/main/java/org/springframework/amqp/rabbit/junit/BrokerRunningSupport.java b/spring-rabbit-junit/src/main/java/org/springframework/amqp/rabbit/junit/BrokerRunningSupport.java
index 9caf727a5..cb7d9a652 100644
--- a/spring-rabbit-junit/src/main/java/org/springframework/amqp/rabbit/junit/BrokerRunningSupport.java
+++ b/spring-rabbit-junit/src/main/java/org/springframework/amqp/rabbit/junit/BrokerRunningSupport.java
@@ -38,6 +38,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.springframework.http.HttpStatus;
 import org.springframework.util.Base64Utils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.util.UriUtils;
@@ -379,11 +380,9 @@ private Channel createQueues(Connection connection) throws IOException, URISynta
 				channel.queueDeclare(queueName, true, false, false, null);
 			}
 		}
-		if (this.management) {
-			if (!alivenessTest()) {
-				throw new BrokerNotAliveException("Aliveness test failed for localhost:15672 guest/quest; "
-						+ "management not available");
-			}
+		if (this.management && !alivenessTest()) {
+			throw new BrokerNotAliveException("Aliveness test failed for localhost:15672 guest/quest; "
+					+ "management not available");
 		}
 		return channel;
 	}
@@ -417,7 +416,11 @@ protected PasswordAuthentication getPasswordAuthentication() {
 			Thread.currentThread().interrupt();
 			return false;
 		}
-		return response.body().contentEquals("{\"status\":\"ok\"}");
+		String body = null;
+		if (response.statusCode() == HttpStatus.OK.value()) {
+			response.body();
+		}
+		return body != null && body.contentEquals("{\"status\":\"ok\"}");
 	}
 
 	public static boolean fatal() {
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/WebFluxNodeLocator.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/WebFluxNodeLocator.java
index 5179ea378..5e00db4ae 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/WebFluxNodeLocator.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/WebFluxNodeLocator.java
@@ -54,7 +54,7 @@ public Map<String, Object> restCall(WebClient client, String baseUri, String vho
 				.bodyToMono(new ParameterizedTypeReference<HashMap<String, Object>>() {
 				})
 				.block(Duration.ofSeconds(10)); // NOSONAR magic#
-		return queueInfo;
+		return queueInfo != null ? queueInfo : null;
 	}
 
 	/**