diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfiguration.java
index 5975802cc5e..de8a6eb505e 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfiguration.java
@@ -18,8 +18,8 @@ package org.springframework.boot.ops.autoconfigure;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.condition.ConditionalOnClass;
-import org.springframework.boot.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.ops.audit.AuditEvent;
 import org.springframework.boot.ops.audit.AuditEventRepository;
 import org.springframework.boot.ops.audit.InMemoryAuditEventRepository;
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfiguration.java
index 56ccc5fccb0..e10acc24631 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfiguration.java
@@ -23,8 +23,8 @@ import java.util.Properties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.bind.PropertiesConfigurationFactory;
-import org.springframework.boot.context.condition.ConditionalOnMissingBean;
 import org.springframework.boot.ops.endpoint.BeansEndpoint;
 import org.springframework.boot.ops.endpoint.DumpEndpoint;
 import org.springframework.boot.ops.endpoint.Endpoint;
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfiguration.java
index 03494729696..3b333abb4a1 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfiguration.java
@@ -25,10 +25,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
-import org.springframework.boot.context.condition.ConditionalOnClass;
-import org.springframework.boot.context.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
 import org.springframework.boot.context.embedded.properties.ServerProperties;
 import org.springframework.boot.ops.endpoint.Endpoint;
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcChildContextConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcChildContextConfiguration.java
index 3cbbab70401..c642bdef036 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcChildContextConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcChildContextConfiguration.java
@@ -21,9 +21,9 @@ import javax.servlet.Filter;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.HierarchicalBeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.condition.ConditionalOnBean;
-import org.springframework.boot.context.condition.ConditionalOnClass;
-import org.springframework.boot.context.condition.SearchStrategy;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.SearchStrategy;
 import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainerFactory;
 import org.springframework.boot.context.embedded.EmbeddedServletContainer;
 import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/ErrorMvcAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/ErrorMvcAutoConfiguration.java
index a81c7586fcc..aaec4b5bcc0 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/ErrorMvcAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/ErrorMvcAutoConfiguration.java
@@ -20,8 +20,8 @@ import javax.servlet.Servlet;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.condition.ConditionalOnClass;
-import org.springframework.boot.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainerFactory;
 import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
 import org.springframework.boot.context.embedded.ErrorPage;
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfiguration.java
index 9c68e0c7905..16deb652983 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfiguration.java
@@ -18,8 +18,8 @@ package org.springframework.boot.ops.autoconfigure;
 
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.web.ServerPropertiesAutoConfiguration;
-import org.springframework.boot.context.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.ops.properties.ManagementServerProperties;
 import org.springframework.context.annotation.Bean;
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfiguration.java
index 812cada76bb..168137c50a5 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfiguration.java
@@ -30,8 +30,8 @@ import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.condition.ConditionalOnBean;
-import org.springframework.boot.context.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.ops.metrics.CounterService;
 import org.springframework.boot.ops.metrics.GaugeService;
 import org.springframework.context.annotation.Bean;
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfiguration.java
index 5a8d7a5a455..f636b721687 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfiguration.java
@@ -17,7 +17,7 @@
 package org.springframework.boot.ops.autoconfigure;
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.ops.metrics.CounterService;
 import org.springframework.boot.ops.metrics.DefaultCounterService;
 import org.springframework.boot.ops.metrics.DefaultGaugeService;
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfiguration.java
index 703bdd20d17..ecdd9378b44 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfiguration.java
@@ -22,8 +22,8 @@ import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.condition.ConditionalOnClass;
-import org.springframework.boot.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.ops.endpoint.Endpoint;
 import org.springframework.boot.ops.endpoint.mvc.EndpointHandlerMapping;
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfiguration.java
index ae5858de69c..2e05ed9a224 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfiguration.java
@@ -17,7 +17,7 @@
 package org.springframework.boot.ops.autoconfigure;
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.ops.trace.InMemoryTraceRepository;
 import org.springframework.boot.ops.trace.TraceRepository;
 import org.springframework.context.annotation.Bean;
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfiguration.java
index b879dc3b4fc..d077e889667 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfiguration.java
@@ -23,7 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.ops.trace.TraceRepository;
 import org.springframework.boot.ops.trace.WebRequestTraceFilter;
 import org.springframework.context.annotation.Bean;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfiguration.java
index e3cc430d497..064ee837d2c 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfiguration.java
@@ -22,9 +22,9 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.springframework.boot.context.condition.ConditionalOnBean;
-import org.springframework.boot.context.condition.ConditionalOnClass;
-import org.springframework.boot.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
 import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
 import org.springframework.context.annotation.Conditional;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfiguration.java
index 5dcea25e835..a2920ae9738 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfiguration.java
@@ -17,7 +17,7 @@
 package org.springframework.boot.autoconfigure;
 
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/PropertyPlaceholderAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/PropertyPlaceholderAutoConfiguration.java
index c784d218d20..f382219707d 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/PropertyPlaceholderAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/PropertyPlaceholderAutoConfiguration.java
@@ -16,7 +16,7 @@
 
 package org.springframework.boot.autoconfigure;
 
-import org.springframework.boot.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java
index 748815e560a..bbf88ca17f0 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java
@@ -20,9 +20,9 @@ import org.springframework.batch.core.launch.JobLauncher;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.ExitCodeGenerator;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.condition.ConditionalOnBean;
-import org.springframework.boot.context.condition.ConditionalOnClass;
-import org.springframework.boot.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/condition/AbstractOnBeanCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractOnBeanCondition.java
similarity index 99%
rename from spring-boot/src/main/java/org/springframework/boot/context/condition/AbstractOnBeanCondition.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractOnBeanCondition.java
index 9a5d9f2c046..2d89f303abd 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/condition/AbstractOnBeanCondition.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractOnBeanCondition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionLogUtils.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionLogUtils.java
similarity index 96%
rename from spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionLogUtils.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionLogUtils.java
index bb7d4eac012..8ff9b2d76e2 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionLogUtils.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionLogUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 import org.apache.commons.logging.Log;
 import org.springframework.core.type.AnnotatedTypeMetadata;
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnBean.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBean.java
similarity index 97%
rename from spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnBean.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBean.java
index 39d5754bb4d..c60d393faff 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnBean.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnClass.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnClass.java
similarity index 96%
rename from spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnClass.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnClass.java
index 9ded0f78830..d9a68bd8f5d 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnClass.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnClass.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnExpression.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpression.java
similarity index 95%
rename from spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnExpression.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpression.java
index da22c43a662..fbeeccffe1d 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnExpression.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpression.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnMissingBean.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBean.java
similarity index 97%
rename from spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnMissingBean.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBean.java
index 5f7a9a3bb4f..1c25286001b 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnMissingBean.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnMissingClass.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingClass.java
similarity index 95%
rename from spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnMissingClass.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingClass.java
index ee7ebdd43fe..7e9782c9eda 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnMissingClass.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingClass.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnNotWebApplication.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplication.java
similarity index 95%
rename from spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnNotWebApplication.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplication.java
index b54c72d572f..00cd5cb5ac8 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnNotWebApplication.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplication.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnResource.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResource.java
similarity index 95%
rename from spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnResource.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResource.java
index da72a7ea67a..6a7ff438435 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnResource.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnWebApplication.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplication.java
similarity index 95%
rename from spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnWebApplication.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplication.java
index 9fa9436b434..49f572d3ed1 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/condition/ConditionalOnWebApplication.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplication.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/condition/OnBeanCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java
similarity index 94%
rename from spring-boot/src/main/java/org/springframework/boot/context/condition/OnBeanCondition.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java
index bb492f1316c..f15568a10d0 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/condition/OnBeanCondition.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 import org.springframework.context.annotation.Condition;
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/condition/OnClassCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java
similarity index 97%
rename from spring-boot/src/main/java/org/springframework/boot/context/condition/OnClassCondition.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java
index fbecd2f3014..4617dffadbf 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/condition/OnClassCondition.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/condition/OnExpressionCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnExpressionCondition.java
similarity index 98%
rename from spring-boot/src/main/java/org/springframework/boot/context/condition/OnExpressionCondition.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnExpressionCondition.java
index 8d6426ba90d..ce9cc375222 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/condition/OnExpressionCondition.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnExpressionCondition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/condition/OnMissingBeanCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnMissingBeanCondition.java
similarity index 95%
rename from spring-boot/src/main/java/org/springframework/boot/context/condition/OnMissingBeanCondition.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnMissingBeanCondition.java
index 48c5ebbe25d..f999cc416eb 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/condition/OnMissingBeanCondition.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnMissingBeanCondition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 import java.util.List;
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/condition/OnMissingClassCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnMissingClassCondition.java
similarity index 97%
rename from spring-boot/src/main/java/org/springframework/boot/context/condition/OnMissingClassCondition.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnMissingClassCondition.java
index 27134b6173d..d5d09a73979 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/condition/OnMissingClassCondition.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnMissingClassCondition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/condition/OnNotWebApplicationCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnNotWebApplicationCondition.java
similarity index 97%
rename from spring-boot/src/main/java/org/springframework/boot/context/condition/OnNotWebApplicationCondition.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnNotWebApplicationCondition.java
index b66687cf917..734c435e7ba 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/condition/OnNotWebApplicationCondition.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnNotWebApplicationCondition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/condition/OnResourceCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnResourceCondition.java
similarity index 98%
rename from spring-boot/src/main/java/org/springframework/boot/context/condition/OnResourceCondition.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnResourceCondition.java
index f9090032c8f..8a4aba44e50 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/condition/OnResourceCondition.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnResourceCondition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/condition/OnWebApplicationCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnWebApplicationCondition.java
similarity index 97%
rename from spring-boot/src/main/java/org/springframework/boot/context/condition/OnWebApplicationCondition.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnWebApplicationCondition.java
index cb5579bcc99..3a07075f2f1 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/condition/OnWebApplicationCondition.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnWebApplicationCondition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/condition/SearchStrategy.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SearchStrategy.java
similarity index 94%
rename from spring-boot/src/main/java/org/springframework/boot/context/condition/SearchStrategy.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SearchStrategy.java
index 5a366882cd8..aeefe485a8a 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/condition/SearchStrategy.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SearchStrategy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 /**
  * Some named search strategies for beans in the bean factory hierarchy.
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/JpaRepositoriesAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/JpaRepositoriesAutoConfiguration.java
index 21ee6019b73..053528f3c27 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/JpaRepositoriesAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/JpaRepositoriesAutoConfiguration.java
@@ -17,8 +17,8 @@
 package org.springframework.boot.autoconfigure.data;
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.condition.ConditionalOnClass;
-import org.springframework.boot.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.jpa.repository.JpaRepository;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
index 975281e4c23..a5288ddf1a8 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
@@ -29,9 +29,9 @@ import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.condition.ConditionLogUtils;
-import org.springframework.boot.context.condition.ConditionalOnClass;
-import org.springframework.boot.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionLogUtils;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Condition;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java
index 404c757618f..090a6c35e4b 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java
@@ -20,9 +20,9 @@ import javax.sql.DataSource;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.condition.ConditionalOnBean;
-import org.springframework.boot.context.condition.ConditionalOnClass;
-import org.springframework.boot.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java
index 5c9666515bd..1f33e2f1a4d 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java
@@ -22,7 +22,7 @@ import java.util.Map;
 import org.hibernate.ejb.HibernateEntityManager;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java
index 0fe5d02ad4e..a477c01fa77 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java
@@ -29,12 +29,12 @@ import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.boot.autoconfigure.AutoConfigurationUtils;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.jdbc.EmbeddedDatabaseConfiguration;
-import org.springframework.boot.context.condition.ConditionalOnBean;
-import org.springframework.boot.context.condition.ConditionalOnClass;
-import org.springframework.boot.context.condition.ConditionalOnExpression;
-import org.springframework.boot.context.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.condition.ConditionalOnWebApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.orm.jpa.JpaTransactionManager;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfiguration.java
index 718d5f184dc..0fc2ee9442e 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfiguration.java
@@ -17,9 +17,9 @@
 package org.springframework.boot.autoconfigure.reactor;
 
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
-import org.springframework.boot.context.condition.ConditionalOnClass;
-import org.springframework.boot.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
index 7b56514c134..0dee625c5ee 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
@@ -29,9 +29,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
-import org.springframework.boot.context.condition.ConditionalOnClass;
-import org.springframework.boot.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.DefaultResourceLoader;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java
index 57bc5c3c04f..bea36932e69 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java
@@ -29,10 +29,10 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.SearchStrategy;
 import org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration.EmbeddedServletContainerCustomizerBeanPostProcessorRegistrar;
-import org.springframework.boot.context.condition.ConditionalOnClass;
-import org.springframework.boot.context.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.condition.SearchStrategy;
 import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor;
 import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
 import org.springframework.boot.context.embedded.ServletContextInitializer;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfiguration.java
index 0d739467921..f4a25b74ac5 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfiguration.java
@@ -20,8 +20,8 @@ import javax.servlet.MultipartConfigElement;
 import javax.servlet.Servlet;
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.condition.ConditionalOnBean;
-import org.springframework.boot.context.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.context.embedded.EmbeddedWebApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfiguration.java
index 44045b3d674..0559edd2ca6 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfiguration.java
@@ -18,7 +18,7 @@ package org.springframework.boot.autoconfigure.web;
 
 import org.springframework.beans.BeansException;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainerFactory;
 import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
 import org.springframework.boot.context.embedded.properties.ServerProperties;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java
index 7da87faebef..9bf362b95ba 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java
@@ -27,9 +27,9 @@ import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.condition.ConditionalOnBean;
-import org.springframework.boot.context.condition.ConditionalOnClass;
-import org.springframework.boot.context.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/condition/OnBeanConditionTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnBeanConditionTests.java
similarity index 96%
rename from spring-boot/src/test/java/org/springframework/boot/context/condition/OnBeanConditionTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnBeanConditionTests.java
index bfcaa50422e..1dcbf8789b5 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/condition/OnBeanConditionTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnBeanConditionTests.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 import org.junit.Ignore;
 import org.junit.Test;
-import org.springframework.boot.context.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/condition/OnClassConditionTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnClassConditionTests.java
similarity index 93%
rename from spring-boot/src/test/java/org/springframework/boot/context/condition/OnClassConditionTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnClassConditionTests.java
index 58fd9c34129..a82abf6a7b9 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/condition/OnClassConditionTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnClassConditionTests.java
@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 import org.junit.Test;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.OnClassCondition;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/condition/OnExpressionConditionTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnExpressionConditionTests.java
similarity index 89%
rename from spring-boot/src/test/java/org/springframework/boot/context/condition/OnExpressionConditionTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnExpressionConditionTests.java
index 2be2bd28073..252f810b954 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/condition/OnExpressionConditionTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnExpressionConditionTests.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 import org.junit.Test;
-import org.springframework.boot.context.condition.ConditionalOnExpression;
-import org.springframework.boot.context.condition.OnExpressionCondition;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.boot.autoconfigure.condition.OnExpressionCondition;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/condition/OnMissingBeanConditionTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnMissingBeanConditionTests.java
similarity index 93%
rename from spring-boot/src/test/java/org/springframework/boot/context/condition/OnMissingBeanConditionTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnMissingBeanConditionTests.java
index 62785f9311a..59d72f418f8 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/condition/OnMissingBeanConditionTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnMissingBeanConditionTests.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 import org.junit.Test;
-import org.springframework.boot.context.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.condition.OnMissingBeanCondition;
-import org.springframework.boot.context.condition.SearchStrategy;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.OnMissingBeanCondition;
+import org.springframework.boot.autoconfigure.condition.SearchStrategy;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/condition/OnMissingClassConditionTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnMissingClassConditionTests.java
similarity index 92%
rename from spring-boot/src/test/java/org/springframework/boot/context/condition/OnMissingClassConditionTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnMissingClassConditionTests.java
index 48aba2727a3..1b1bdf46583 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/condition/OnMissingClassConditionTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnMissingClassConditionTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 import org.junit.Test;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -51,7 +51,7 @@ public class OnMissingClassConditionTests {
 	}
 
 	@Configuration
-	@ConditionalOnMissingClass("org.springframework.boot.context.condition.OnMissingClassConditionTests")
+	@ConditionalOnMissingClass("org.springframework.boot.autoconfigure.condition.OnMissingClassConditionTests")
 	protected static class BasicConfiguration {
 		@Bean
 		public String bar() {
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/condition/OnNotWebApplicationConditionTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnNotWebApplicationConditionTests.java
similarity index 85%
rename from spring-boot/src/test/java/org/springframework/boot/context/condition/OnNotWebApplicationConditionTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnNotWebApplicationConditionTests.java
index c2391c2f4bf..6cdcf884977 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/condition/OnNotWebApplicationConditionTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnNotWebApplicationConditionTests.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 import org.junit.Test;
-import org.springframework.boot.context.condition.ConditionalOnNotWebApplication;
-import org.springframework.boot.context.condition.ConditionalOnWebApplication;
-import org.springframework.boot.context.condition.OnNotWebApplicationCondition;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnNotWebApplication;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.boot.autoconfigure.condition.OnNotWebApplicationCondition;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/condition/OnResourceConditionTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnResourceConditionTests.java
similarity index 90%
rename from spring-boot/src/test/java/org/springframework/boot/context/condition/OnResourceConditionTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnResourceConditionTests.java
index 1e4db88015d..84b57ebae0a 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/condition/OnResourceConditionTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnResourceConditionTests.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 import org.junit.Test;
-import org.springframework.boot.context.condition.ConditionalOnResource;
-import org.springframework.boot.context.condition.OnResourceCondition;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnResource;
+import org.springframework.boot.autoconfigure.condition.OnResourceCondition;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/condition/OnWebApplicationConditionTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnWebApplicationConditionTests.java
similarity index 86%
rename from spring-boot/src/test/java/org/springframework/boot/context/condition/OnWebApplicationConditionTests.java
rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnWebApplicationConditionTests.java
index a77765a6f87..5c5f7909686 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/condition/OnWebApplicationConditionTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnWebApplicationConditionTests.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.context.condition;
+package org.springframework.boot.autoconfigure.condition;
 
 import org.junit.Test;
-import org.springframework.boot.context.condition.ConditionalOnNotWebApplication;
-import org.springframework.boot.context.condition.ConditionalOnWebApplication;
-import org.springframework.boot.context.condition.OnWebApplicationCondition;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnNotWebApplication;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.boot.autoconfigure.condition.OnWebApplicationCondition;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.mock.web.MockServletContext;
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java
index ef9fa605782..2bb82f4e001 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java
@@ -21,8 +21,8 @@ import javax.servlet.Servlet;
 import org.junit.Test;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
-import org.springframework.boot.context.condition.ConditionalOnExpression;
 import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
 import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainerFactory;
 import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/condition/AssertMissingBean.java b/spring-boot/src/test/java/org/springframework/boot/context/condition/AssertMissingBean.java
deleted file mode 100644
index c0ebf80694f..00000000000
--- a/spring-boot/src/test/java/org/springframework/boot/context/condition/AssertMissingBean.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2012-2013 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.boot.context.condition;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.boot.context.condition.ConditionalOnMissingBean;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Conditional;
-
-/**
- * {@link Conditional} that only matches when the specified bean classes and/or names are
- * not already contained in the {@link BeanFactory}, and throws an exception otherwise.
- * 
- * @author Dave Syer
- * @see ConditionalOnMissingBean
- */
-@Target({ ElementType.TYPE, ElementType.METHOD })
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Conditional(AssertMissingBeanCondition.class)
-public @interface AssertMissingBean {
-
-	/**
-	 * The class type of bean that should be checked. The condition matches when each
-	 * class specified is missing in the {@link ApplicationContext}.
-	 * @return the class types of beans to check
-	 */
-	Class<?>[] value() default {};
-
-	/**
-	 * The names of beans to check. The condition matches when each bean name specified is
-	 * missing in the {@link ApplicationContext}.
-	 * @return the name of beans to check
-	 */
-	String[] name() default {};
-
-	/**
-	 * If the application context hierarchy (parent contexts) should be considered.
-	 */
-	boolean considerHierarchy() default true;
-
-}
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/condition/AssertMissingBeanCondition.java b/spring-boot/src/test/java/org/springframework/boot/context/condition/AssertMissingBeanCondition.java
deleted file mode 100644
index 1a5a48ddb46..00000000000
--- a/spring-boot/src/test/java/org/springframework/boot/context/condition/AssertMissingBeanCondition.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2012-2013 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.boot.context.condition;
-
-import java.util.List;
-
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.boot.context.condition.OnMissingBeanCondition;
-import org.springframework.context.annotation.Condition;
-import org.springframework.context.annotation.ConditionContext;
-import org.springframework.core.type.AnnotatedTypeMetadata;
-
-/**
- * {@link Condition} that checks that specific beans are missing.
- * 
- * @author Dave Syer
- * @see AssertMissingBean
- */
-class AssertMissingBeanCondition extends OnMissingBeanCondition {
-
-	@Override
-	protected Class<?> annotationClass() {
-		return AssertMissingBean.class;
-	}
-
-	@Override
-	protected boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata,
-			List<String> beanClasses, List<String> beanNames) throws LinkageError {
-		boolean result = super.matches(context, metadata, beanClasses, beanNames);
-		if (!result) {
-			throw new BeanCreationException("Found existing bean for classes="
-					+ beanClasses + " and names=" + beanNames);
-		}
-		return result;
-	}
-
-}
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java b/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java
index 207eab4ae4c..f92a637bd5e 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java
@@ -23,11 +23,8 @@ import java.util.List;
 import javax.annotation.PostConstruct;
 
 import org.junit.Test;
-import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.TestUtils;
-import org.springframework.boot.context.condition.AssertMissingBean;
-import org.springframework.boot.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -90,30 +87,9 @@ public class EnableConfigurationPropertiesTests {
 		assertEquals("bar", this.context.getBean(TestProperties.class).getName());
 	}
 
-	@Test(expected = BeanCreationException.class)
-	public void testPropertiesBindingWithDefaultsInBeanMethodReverseOrder() {
-		this.context.register(TestBeanConfiguration.class, DefaultConfiguration.class);
-		this.context.refresh();
-		String[] beanNames = this.context.getBeanNamesForType(TestProperties.class);
-		assertEquals("Wrong beans: " + Arrays.asList(beanNames), 1, beanNames.length);
-		assertEquals("bar", this.context.getBean(TestProperties.class).getName());
-	}
-
 	@Test
 	public void testPropertiesBindingWithDefaultsInBeanMethod() {
-		this.context.register(DefaultConfiguration.class, TestBeanConfiguration.class);
-		this.context.refresh();
-		String[] beanNames = this.context.getBeanNamesForType(TestProperties.class);
-		assertEquals("Wrong beans: " + Arrays.asList(beanNames), 1, beanNames.length);
-		assertEquals("bar", this.context.getBean(TestProperties.class).getName());
-	}
-
-	// Maybe we could relax the condition that causes this exception but Spring makes it
-	// difficult because it is impossible for DefaultConfiguration to override a bean
-	// definition created with a direct registration (as opposed to a @Bean)
-	@Test(expected = BeanCreationException.class)
-	public void testPropertiesBindingWithDefaults() {
-		this.context.register(TestConfiguration.class, DefaultConfiguration.class);
+		this.context.register(DefaultConfiguration.class);
 		this.context.refresh();
 		String[] beanNames = this.context.getBeanNamesForType(TestProperties.class);
 		assertEquals("Wrong beans: " + Arrays.asList(beanNames), 1, beanNames.length);
@@ -204,20 +180,9 @@ public class EnableConfigurationPropertiesTests {
 	protected static class TestConfiguration {
 	}
 
-	@Configuration
-	@EnableConfigurationProperties
-	protected static class TestBeanConfiguration {
-		@ConditionalOnMissingBean(TestProperties.class)
-		@Bean(name = "org.springframework.boot.context.annotation.EnableConfigurationPropertiesTests$TestProperties")
-		public TestProperties testProperties() {
-			return new TestProperties();
-		}
-	}
-
 	@Configuration
 	protected static class DefaultConfiguration {
 		@Bean
-		@AssertMissingBean(TestProperties.class)
 		public TestProperties testProperties() {
 			TestProperties test = new TestProperties();
 			test.setName("bar");