diff --git a/spring-core/src/main/java/com/baeldung/factorybean/FactoryBeanAppConfig.java b/spring-core/src/main/java/com/baeldung/factorybean/FactoryBeanAppConfig.java
index 02eef57e3d..f0cfadcab1 100644
--- a/spring-core/src/main/java/com/baeldung/factorybean/FactoryBeanAppConfig.java
+++ b/spring-core/src/main/java/com/baeldung/factorybean/FactoryBeanAppConfig.java
@@ -6,16 +6,11 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 public class FactoryBeanAppConfig {
     
-    @Bean
+    @Bean(name = "tool")
     public ToolFactory toolFactory() {
         ToolFactory factory = new ToolFactory();
         factory.setFactoryId(7070);
         factory.setToolId(2);
         return factory;
     }
-
-    @Bean
-    public Tool tool() throws Exception {
-        return toolFactory().getObject();
-    }
 }
diff --git a/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanJavaConfigTest.java b/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanJavaConfigTest.java
index 1bd1f3d234..700d8050c7 100644
--- a/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanJavaConfigTest.java
+++ b/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanJavaConfigTest.java
@@ -7,6 +7,8 @@ import javax.annotation.Resource;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -14,9 +16,9 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 @ContextConfiguration(classes = FactoryBeanAppConfig.class)
 public class FactoryBeanJavaConfigTest {
 
-    @Resource
+    @Autowired
     private Tool tool;
-    @Resource(name = "&toolFactory")
+    @Resource(name = "&tool")
     private ToolFactory toolFactory;
 
     @Test
diff --git a/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanXmlConfigTest.java b/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanXmlConfigTest.java
index b479b231d9..8ba1129b30 100644
--- a/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanXmlConfigTest.java
+++ b/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanXmlConfigTest.java
@@ -7,6 +7,7 @@ import javax.annotation.Resource;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -14,7 +15,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 @ContextConfiguration(locations = { "classpath:factorybean-spring-ctx.xml" })
 public class FactoryBeanXmlConfigTest {
 
-    @Resource
+    @Autowired
     private Tool tool;
     @Resource(name = "&tool")
     private ToolFactory toolFactory;