diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java
index be7c1511732..d21e8ff4db2 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java
@@ -51,10 +51,15 @@ import org.springframework.data.couchbase.repository.support.IndexManager;
 @EnableConfigurationProperties(CouchbaseProperties.class)
 public class CouchbaseAutoConfiguration {
 
-	@Bean
-	@ConditionalOnBean(Validator.class)
-	public ValidatingCouchbaseEventListener validationEventListener(Validator validator) {
-		return new ValidatingCouchbaseEventListener(validator);
+	@Configuration
+	@ConditionalOnClass(Validator.class)
+	public static class ValidationConfiguration {
+
+		@Bean
+		@ConditionalOnBean(Validator.class)
+		public ValidatingCouchbaseEventListener validationEventListener(Validator validator) {
+			return new ValidatingCouchbaseEventListener(validator);
+		}
 	}
 
 	@Configuration