diff --git a/.DS_Store b/.DS_Store
index a71e5ff..f17d245 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/3.5/demo-app/src/main/java/com/example/demo/AppConfig.java b/3.5/demo-app/src/main/java/com/example/demo/AppConfig.java
index ba90bd5..1406d73 100644
--- a/3.5/demo-app/src/main/java/com/example/demo/AppConfig.java
+++ b/3.5/demo-app/src/main/java/com/example/demo/AppConfig.java
@@ -1,11 +1,11 @@
 package com.example.demo;
 
-import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
 import java.util.List;
 
-@AutoConfiguration
+@Configuration(proxyBeanMethods = false)
 public class AppConfig {
 
     @Bean
diff --git a/3.5/demo-app/src/main/java/com/example/demo/FooConfig.java b/3.5/demo-app/src/main/java/com/example/demo/FooAutoConfiguration.java
similarity index 72%
rename from 3.5/demo-app/src/main/java/com/example/demo/FooConfig.java
rename to 3.5/demo-app/src/main/java/com/example/demo/FooAutoConfiguration.java
index 2fac5dc..6ae934c 100644
--- a/3.5/demo-app/src/main/java/com/example/demo/FooConfig.java
+++ b/3.5/demo-app/src/main/java/com/example/demo/FooAutoConfiguration.java
@@ -2,17 +2,14 @@
 
 import com.example.library.Bar;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 @AutoConfiguration(before = AppConfig.class, afterName = "com.example.library.BarAutoConfiguration")
 @ConditionalOnClass(Bar.class)
 @ConditionalOnBean(Bar.class)
-public class FooConfig {
+public class FooAutoConfiguration {
 
     @Bean
     public Foo foo(Bar bar) {
diff --git a/3.5/demo-app/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/3.5/demo-app/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 2bcc747..5c7ed0c 100644
--- a/3.5/demo-app/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/3.5/demo-app/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,2 +1 @@
-com.example.demo.AppConfig
-com.example.demo.FooConfig
\ No newline at end of file
+com.example.demo.FooAutoConfiguration
\ No newline at end of file
diff --git a/3.5/demo-app/src/test/java/com/example/demo/FooConsumerTest.java b/3.5/demo-app/src/test/java/com/example/demo/FooConsumerTest.java
index 6b87e21..a6dfe11 100644
--- a/3.5/demo-app/src/test/java/com/example/demo/FooConsumerTest.java
+++ b/3.5/demo-app/src/test/java/com/example/demo/FooConsumerTest.java
@@ -1,17 +1,18 @@
 package com.example.demo;
 
 import com.example.library.Bar;
-import com.example.library.EnableBarTest;
+import com.example.library.BarAutoConfiguration;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
-@SpringBootTest(classes = {AppConfig.class, FooConfig.class}, properties = {"debug=true"})
-@EnableBarTest
+@SpringBootTest(classes = AppConfig.class, properties = {"debug=true"})
+@ImportAutoConfiguration({BarAutoConfiguration.class, FooAutoConfiguration.class})
 public class FooConsumerTest {
 
     @MockitoSpyBean