diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/trace/reactive/ServerWebExchangeTraceableRequest.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/trace/reactive/ServerWebExchangeTraceableRequest.java
index ea1da8a422..a2187e3c86 100644
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/trace/reactive/ServerWebExchangeTraceableRequest.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/trace/reactive/ServerWebExchangeTraceableRequest.java
@@ -50,6 +50,12 @@ class ServerWebExchangeTraceableRequest implements TraceableRequest {
 		this.remoteAddress = getRemoteAddress(request);
 	}
 
+	private static String getRemoteAddress(ServerHttpRequest request) {
+		InetSocketAddress remoteAddress = request.getRemoteAddress();
+		InetAddress address = (remoteAddress != null) ? remoteAddress.getAddress() : null;
+		return (address != null) ? address.toString() : null;
+	}
+
 	@Override
 	public String getMethod() {
 		return this.method;
@@ -70,10 +76,4 @@ class ServerWebExchangeTraceableRequest implements TraceableRequest {
 		return this.remoteAddress;
 	}
 
-	private static String getRemoteAddress(ServerHttpRequest request) {
-		InetSocketAddress remoteAddress = request.getRemoteAddress();
-		InetAddress address = (remoteAddress != null) ? remoteAddress.getAddress() : null;
-		return (address != null) ? address.toString() : null;
-	}
-
 }
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/trace/reactive/ServerWebExchangeTraceableRequestTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/trace/reactive/ServerWebExchangeTraceableRequestTests.java
index 433675cad8..2a50106c60 100644
--- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/trace/reactive/ServerWebExchangeTraceableRequestTests.java
+++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/trace/reactive/ServerWebExchangeTraceableRequestTests.java
@@ -28,7 +28,7 @@ import org.springframework.web.server.ServerWebExchange;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
-import static org.mockito.Mockito.doReturn;
+import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 
 /**
@@ -46,13 +46,13 @@ public class ServerWebExchangeTraceableRequestTests {
 	public void setUp() {
 		this.exchange = mock(ServerWebExchange.class);
 		this.request = mock(ServerHttpRequest.class);
-		doReturn(this.request).when(this.exchange).getRequest();
+		given(this.exchange.getRequest()).willReturn(this.request);
 	}
 
 	@Test
 	public void getMethod() {
 		String method = "POST";
-		doReturn(method).when(this.request).getMethodValue();
+		given(this.request.getMethodValue()).willReturn(method);
 		ServerWebExchangeTraceableRequest traceableRequest = new ServerWebExchangeTraceableRequest(
 				this.exchange);
 		assertThat(traceableRequest.getMethod()).isSameAs(method);
@@ -61,7 +61,7 @@ public class ServerWebExchangeTraceableRequestTests {
 	@Test
 	public void getUri() {
 		URI uri = URI.create("http://localhost:8080/");
-		doReturn(uri).when(this.request).getURI();
+		given(this.request.getURI()).willReturn(uri);
 		ServerWebExchangeTraceableRequest traceableRequest = new ServerWebExchangeTraceableRequest(
 				this.exchange);
 		assertThat(traceableRequest.getUri()).isSameAs(uri);
@@ -71,7 +71,7 @@ public class ServerWebExchangeTraceableRequestTests {
 	public void getHeaders() {
 		HttpHeaders httpHeaders = new HttpHeaders();
 		httpHeaders.add("name", "value");
-		doReturn(httpHeaders).when(this.request).getHeaders();
+		given(this.request.getHeaders()).willReturn(httpHeaders);
 		ServerWebExchangeTraceableRequest traceableRequest = new ServerWebExchangeTraceableRequest(
 				this.exchange);
 		assertThat(traceableRequest.getHeaders())
@@ -80,18 +80,18 @@ public class ServerWebExchangeTraceableRequestTests {
 
 	@Test
 	public void getUnresolvedRemoteAddress() {
-		InetSocketAddress socketAddress = InetSocketAddress.createUnresolved("", 0);
-		doReturn(socketAddress).when(this.request).getRemoteAddress();
+		InetSocketAddress socketAddress = InetSocketAddress
+				.createUnresolved("unresolved.example.com", 8080);
+		given(this.request.getRemoteAddress()).willReturn(socketAddress);
 		ServerWebExchangeTraceableRequest traceableRequest = new ServerWebExchangeTraceableRequest(
 				this.exchange);
 		assertThat(traceableRequest.getRemoteAddress()).isNull();
-
 	}
 
 	@Test
 	public void getRemoteAddress() {
 		InetSocketAddress socketAddress = new InetSocketAddress(0);
-		doReturn(socketAddress).when(this.request).getRemoteAddress();
+		given(this.request.getRemoteAddress()).willReturn(socketAddress);
 		ServerWebExchangeTraceableRequest traceableRequest = new ServerWebExchangeTraceableRequest(
 				this.exchange);
 		assertThat(traceableRequest.getRemoteAddress())