diff --git a/org.springframework.context/src/main/java/org/springframework/context/config/AdviceMode.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/AdviceMode.java
similarity index 85%
rename from org.springframework.context/src/main/java/org/springframework/context/config/AdviceMode.java
rename to org.springframework.context/src/main/java/org/springframework/context/annotation/AdviceMode.java
index 347b84bdb13..91b82e2825d 100644
--- a/org.springframework.context/src/main/java/org/springframework/context/config/AdviceMode.java
+++ b/org.springframework.context/src/main/java/org/springframework/context/annotation/AdviceMode.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.context.config;
+package org.springframework.context.annotation;
 
 /**
- * Enumeration used to determine whether proxy-based or AspectJ-based advice should be
- * applied.
+ * Enumeration used to determine whether JDK proxy-based or AspectJ weaving-based advice
+ * should be applied.
  *
  * @author Chris Beams
  * @since 3.1
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurationSelector.java b/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurationSelector.java
index 8cfd0a103bd..488d6599872 100644
--- a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurationSelector.java
+++ b/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurationSelector.java
@@ -18,10 +18,10 @@ package org.springframework.scheduling.annotation;
 
 import java.util.Map;
 
+import org.springframework.context.annotation.AdviceMode;
 import org.springframework.context.annotation.AnnotationConfigUtils;
 import org.springframework.context.annotation.ImportSelectorContext;
 import org.springframework.context.annotation.ImportSelector;
-import org.springframework.context.config.AdviceMode;
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.util.Assert;
 
diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java b/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
index 35f79b9b94b..5a0266e5b67 100644
--- a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
+++ b/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
@@ -23,9 +23,9 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.springframework.context.annotation.AdviceMode;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.context.config.AdviceMode;
 import org.springframework.core.Ordered;
 
 /**
diff --git a/org.springframework.context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java b/org.springframework.context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java
index 8a79ddddf09..224da8f4feb 100644
--- a/org.springframework.context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java
+++ b/org.springframework.context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java
@@ -32,10 +32,10 @@ import org.springframework.aop.Advisor;
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.springframework.context.annotation.AdviceMode;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.config.AdviceMode;
 import org.springframework.core.Ordered;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java b/org.springframework.integration-tests/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java
index 403f12494a1..6391a5328e3 100644
--- a/org.springframework.integration-tests/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java
+++ b/org.springframework.integration-tests/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java
@@ -37,11 +37,11 @@ import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.concurrent.ConcurrentMapCache;
 import org.springframework.cache.support.SimpleCacheManager;
+import org.springframework.context.annotation.AdviceMode;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
-import org.springframework.context.config.AdviceMode;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/EnableTransactionManagement.java b/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/EnableTransactionManagement.java
index 922a0566db3..9ef25b083dc 100644
--- a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/EnableTransactionManagement.java
+++ b/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/EnableTransactionManagement.java
@@ -22,8 +22,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.springframework.context.annotation.AdviceMode;
 import org.springframework.context.annotation.Import;
-import org.springframework.context.config.AdviceMode;
 import org.springframework.core.Ordered;
 
 /**
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurationSelector.java b/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurationSelector.java
index c04a37c2002..e26ac1c2470 100644
--- a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurationSelector.java
+++ b/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurationSelector.java
@@ -20,10 +20,10 @@ import java.util.Map;
 
 import org.springframework.aop.config.AopConfigUtils;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.context.annotation.AdviceMode;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportSelectorContext;
 import org.springframework.context.annotation.ImportSelector;
-import org.springframework.context.config.AdviceMode;
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.util.Assert;
 
diff --git a/org.springframework.transaction/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java b/org.springframework.transaction/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java
index f9727cc54c6..fcbc5e880ab 100644
--- a/org.springframework.transaction/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java
+++ b/org.springframework.transaction/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java
@@ -24,10 +24,10 @@ import java.util.Map;
 
 import org.junit.Test;
 import org.springframework.aop.support.AopUtils;
+import org.springframework.context.annotation.AdviceMode;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.config.AdviceMode;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;