diff --git a/src/main/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrar.java b/src/main/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrar.java
index 5f6a2d3cc..480563738 100644
--- a/src/main/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrar.java
+++ b/src/main/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrar.java
@@ -87,8 +87,9 @@ class JpaAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
 
 		registerBeanConfigurerAspectIfNecessary(registry);
 		super.registerBeanDefinitions(annotationMetadata, registry);
-		registerInfrastructureBeanWithId(BeanDefinitionBuilder.rootBeanDefinition(AuditingBeanFactoryPostProcessor.class)
-				.getRawBeanDefinition(), AuditingBeanFactoryPostProcessor.class.getName(), registry);
+		registerInfrastructureBeanWithId(
+				BeanDefinitionBuilder.rootBeanDefinition(AuditingBeanFactoryPostProcessor.class).getRawBeanDefinition(),
+				AuditingBeanFactoryPostProcessor.class.getName(), registry);
 	}
 
 	/* 
@@ -132,7 +133,7 @@ class JpaAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
 		def.setFactoryMethodName("aspectOf");
 		def.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
 
-		registry.registerBeanDefinition(BEAN_CONFIGURER_ASPECT_BEAN_NAME, new BeanComponentDefinition(def,
-				BEAN_CONFIGURER_ASPECT_BEAN_NAME).getBeanDefinition());
+		registry.registerBeanDefinition(BEAN_CONFIGURER_ASPECT_BEAN_NAME,
+				new BeanComponentDefinition(def, BEAN_CONFIGURER_ASPECT_BEAN_NAME).getBeanDefinition());
 	}
 }
diff --git a/src/test/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrarUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrarUnitTests.java
index 10a43dc2c..28355050f 100644
--- a/src/test/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrarUnitTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrarUnitTests.java
@@ -15,13 +15,15 @@
  */
 package org.springframework.data.jpa.repository.config;
 
-import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.core.type.classreading.MetadataReader;
@@ -66,7 +68,7 @@ public class JpaAuditingRegistrarUnitTests {
 		registrar.registerBeanDefinitions(annotationMetadata, registry);
 
 		// Then the bean is not registered again
-		verify(registry, times(0)).registerBeanDefinition(eq(beanName), any());
+		verify(registry, times(0)).registerBeanDefinition(eq(beanName), Mockito.<BeanDefinition> any());
 
 		registrar.registerBeanDefinitions(annotationMetadata, registry);
 	}