diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/test/MockClientHttpRequestFactory.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/test/MockClientHttpRequestFactory.java
index bf97c02791f..f7f11276a59 100644
--- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/test/MockClientHttpRequestFactory.java
+++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/test/MockClientHttpRequestFactory.java
@@ -57,7 +57,7 @@ public class MockClientHttpRequestFactory implements ClientHttpRequestFactory {
 
 	public void willRespond(HttpStatus... response) {
 		for (HttpStatus status : response) {
-			this.responses.add(new Response(0, NO_DATA, status));
+			this.responses.add(new Response(0, null, status));
 		}
 	}
 
@@ -119,7 +119,7 @@ public class MockClientHttpRequestFactory implements ClientHttpRequestFactory {
 
 		public ClientHttpResponse asHttpResponse(AtomicLong seq) {
 			MockClientHttpResponse httpResponse = new MockClientHttpResponse(
-					this.payload == null ? new byte[0] : this.payload, this.status);
+					this.payload == null ? NO_DATA : this.payload, this.status);
 			waitForDelay();
 			if (this.payload != null) {
 				httpResponse.getHeaders().setContentLength(this.payload.length);