diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java
index 1f523d026ece..29d13f3f84f1 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -215,7 +215,9 @@ void providesASingletonScopedBookmarkManagerIfNecessaryAndPossible() {
 	void doesNotProvideABookmarkManagerIfNotPossible() {
 		this.contextRunner.withClassLoader(new FilteredClassLoader(Caffeine.class, EmbeddedDriver.class))
 				.withUserConfiguration(BookmarkManagementEnabledConfiguration.class)
-				.run((context) -> assertThat(context).doesNotHaveBean(BookmarkManager.class));
+				.run((context) -> assertThat(context).hasFailed().getFailure()
+						.hasMessageContaining("Bookmark management has been enabled")
+						.hasMessageContaining("Please provide a bookmark manager"));
 	}
 
 	private static void assertDomainTypesDiscovered(Neo4jMappingContext mappingContext, Class<?>... types) {