diff --git a/spring-boot/src/main/java/org/springframework/boot/liquibase/LiquibaseServiceLocatorApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/liquibase/LiquibaseServiceLocatorApplicationListener.java
index 8cfc967d3ed5..ef0954525269 100644
--- a/spring-boot/src/main/java/org/springframework/boot/liquibase/LiquibaseServiceLocatorApplicationListener.java
+++ b/spring-boot/src/main/java/org/springframework/boot/liquibase/LiquibaseServiceLocatorApplicationListener.java
@@ -31,6 +31,7 @@
  *
  * @author Phillip Webb
  * @author Dave Syer
+ * @author Eddú Meléndez
  */
 public class LiquibaseServiceLocatorApplicationListener
 		implements ApplicationListener<ApplicationStartingEvent> {
@@ -51,12 +52,14 @@ public void onApplicationEvent(ApplicationStartingEvent event) {
 	private static class LiquibasePresent {
 
 		public void replaceServiceLocator() {
-			CustomResolverServiceLocator customResolverServiceLocator = new CustomResolverServiceLocator(
-					new SpringPackageScanClassResolver(logger));
-			customResolverServiceLocator.addPackageToScan(
-					CommonsLoggingLiquibaseLogger.class.getPackage().getName());
-			ServiceLocator.setInstance(customResolverServiceLocator);
-			liquibase.logging.LogFactory.reset();
+			if (ClassUtils.isPresent("liquibase.servicelocator.CustomResolverServiceLocator", null)) {
+				CustomResolverServiceLocator customResolverServiceLocator = new CustomResolverServiceLocator(
+						new SpringPackageScanClassResolver(logger));
+				customResolverServiceLocator.addPackageToScan(
+						CommonsLoggingLiquibaseLogger.class.getPackage().getName());
+				ServiceLocator.setInstance(customResolverServiceLocator);
+				liquibase.logging.LogFactory.reset();
+			}
 		}
 
 	}