diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AutoConfigurationReportEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AutoConfigurationReportEndpoint.java
index 7afbce612e..0f65882ed9 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AutoConfigurationReportEndpoint.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AutoConfigurationReportEndpoint.java
@@ -32,6 +32,8 @@ import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.util.StringUtils;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
@@ -60,6 +62,7 @@ public class AutoConfigurationReportEndpoint extends AbstractEndpoint<Report> {
 	 * Adapts {@link AutoConfigurationReport} to a JSON friendly structure.
 	 */
 	@JsonPropertyOrder({ "positiveMatches", "negativeMatches" })
+	@JsonInclude(Include.NON_EMPTY)
 	public static class Report {
 
 		private MultiValueMap<String, MessageAndCondition> positiveMatches;
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReportTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReportTests.java
index ce09ea47b6..e4961d7eb6 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReportTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReportTests.java
@@ -112,9 +112,7 @@ public class AutoConfigurationReportTests {
 		this.beanFactory.setParentBeanFactory(new DefaultListableBeanFactory());
 		AutoConfigurationReport.get((ConfigurableListableBeanFactory) this.beanFactory
 				.getParentBeanFactory());
-		this.report = AutoConfigurationReport.get(this.beanFactory); // NB: overrides
-																		// setup
-
+		this.report = AutoConfigurationReport.get(this.beanFactory);
 		assertThat(this.report, not(nullValue()));
 		assertThat(this.report, not(sameInstance(this.report.getParent())));
 		assertThat(this.report.getParent(), not(nullValue()));