diff --git a/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/DataInitializer.java b/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/DataInitializer.java
index 8004ba1a..c8e45364 100644
--- a/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/DataInitializer.java
+++ b/jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/DataInitializer.java
@@ -20,7 +20,6 @@ import javax.sql.DataSource;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
@@ -47,7 +46,7 @@ import example.springdata.jpa.multipleds.order.OrderRepository;
  * @author Oliver Gierke
  */
 @Component
-@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequiredArgsConstructor
 public class DataInitializer {
 
 	private final @NonNull OrderRepository orders;
diff --git a/mongodb/aggregation/src/main/java/example/springdata/mongodb/aggregation/OrderRepositoryImpl.java b/mongodb/aggregation/src/main/java/example/springdata/mongodb/aggregation/OrderRepositoryImpl.java
index 0225dbf6..9f1c95eb 100644
--- a/mongodb/aggregation/src/main/java/example/springdata/mongodb/aggregation/OrderRepositoryImpl.java
+++ b/mongodb/aggregation/src/main/java/example/springdata/mongodb/aggregation/OrderRepositoryImpl.java
@@ -31,7 +31,7 @@ import org.springframework.data.mongodb.core.aggregation.AggregationResults;
  * @author Thomas Darimont
  * @author Oliver Gierke
  */
-@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequiredArgsConstructor
 class OrderRepositoryImpl implements OrderRepositoryCustom {
 
 	private final MongoOperations operations;
diff --git a/web/example/src/main/java/example/users/UserManagement.java b/web/example/src/main/java/example/users/UserManagement.java
index 523ea986..2c8c7490 100644
--- a/web/example/src/main/java/example/users/UserManagement.java
+++ b/web/example/src/main/java/example/users/UserManagement.java
@@ -35,7 +35,7 @@ import org.springframework.util.Assert;
  */
 @Transactional
 @Service
-@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequiredArgsConstructor
 public class UserManagement {
 
 	private final UserRepository repository;
diff --git a/web/example/src/main/java/example/users/web/UserController.java b/web/example/src/main/java/example/users/web/UserController.java
index 721c78d4..d19acc8b 100644
--- a/web/example/src/main/java/example/users/web/UserController.java
+++ b/web/example/src/main/java/example/users/web/UserController.java
@@ -52,7 +52,7 @@ import example.users.Username;
  * @author Oliver Gierke
  */
 @Controller
-@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequiredArgsConstructor
 @RequestMapping("/users")
 class UserController {
 
diff --git a/web/querydsl/src/main/java/example/users/web/UserController.java b/web/querydsl/src/main/java/example/users/web/UserController.java
index a4485522..ea5aee2d 100644
--- a/web/querydsl/src/main/java/example/users/web/UserController.java
+++ b/web/querydsl/src/main/java/example/users/web/UserController.java
@@ -19,7 +19,6 @@ import example.users.User;
 import example.users.UserRepository;
 import lombok.RequiredArgsConstructor;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.querydsl.binding.QuerydslPredicate;
 import org.springframework.data.web.PageableDefault;
@@ -40,7 +39,7 @@ import com.querydsl.core.types.Predicate;
  * @author Oliver Gierke
  */
 @Controller
-@RequiredArgsConstructor(onConstructor = @__(@Autowired) )
+@RequiredArgsConstructor
 class UserController {
 
 	private final UserRepository repository;