diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/AbstractLdapTemplateIntegrationTests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/AbstractLdapTemplateIntegrationTests.java
index 2f6780d5..e233062f 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/AbstractLdapTemplateIntegrationTests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/AbstractLdapTemplateIntegrationTests.java
@@ -49,7 +49,7 @@ import org.springframework.test.context.support.DirtiesContextTestExecutionListe
 @TestExecutionListeners({ DependencyInjectionTestExecutionListener.class, DirtiesContextTestExecutionListener.class })
 public abstract class AbstractLdapTemplateIntegrationTests {
 
-	private final static String DEFAULT_BASE = "dc=261consulting,dc=com";
+	private static final String DEFAULT_BASE = "dc=261consulting,dc=com";
 
 	@Autowired
 	@Qualifier("contextSource")
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientLookupITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientLookupITests.java
index ad9c9a6c..60c9c344 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientLookupITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientLookupITests.java
@@ -180,6 +180,7 @@ public class DefaultLdapClientLookupITests extends AbstractLdapTemplateIntegrati
 		 *
 		 * @see AttributesMapper#mapFromAttributes(Attributes)
 		 */
+		@Override
 		public Person mapFromAttributes(Attributes attributes) throws NamingException {
 			Person person = new Person();
 			person.setFullname((String) attributes.get("cn").get());
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupITests.java
index 37aefe22..32791e40 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupITests.java
@@ -178,6 +178,7 @@ public class LdapTemplateLookupITests extends AbstractLdapTemplateIntegrationTes
 		 *
 		 * @see org.springframework.ldap.core.AttributesMapper#mapFromAttributes(javax.naming.directory.Attributes)
 		 */
+		@Override
 		public Object mapFromAttributes(Attributes attributes) throws NamingException {
 			Person person = new Person();
 			person.setFullname((String) attributes.get("cn").get());
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/simple/SimpleLdapTemplateITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/simple/SimpleLdapTemplateITests.java
index 3f410944..b9cc0062 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/simple/SimpleLdapTemplateITests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/simple/SimpleLdapTemplateITests.java
@@ -225,6 +225,7 @@ public class SimpleLdapTemplateITests extends AbstractLdapTemplateIntegrationTes
 
 	private static final class CnContextMapper implements ContextMapper<String> {
 
+		@Override
 		public String mapFromContext(Object ctx) {
 			DirContextAdapter adapter = (DirContextAdapter) ctx;
 
@@ -239,18 +240,20 @@ public class SimpleLdapTemplateITests extends AbstractLdapTemplateIntegrationTes
 
 		private boolean postProcessCalled;
 
-		public boolean isPreProcessCalled() {
+		boolean isPreProcessCalled() {
 			return this.preProcessCalled;
 		}
 
-		public boolean isPostProcessCalled() {
+		boolean isPostProcessCalled() {
 			return this.postProcessCalled;
 		}
 
+		@Override
 		public void postProcess(DirContext ctx) throws NamingException {
 			this.preProcessCalled = true;
 		}
 
+		@Override
 		public void preProcess(DirContext ctx) throws NamingException {
 			this.postProcessCalled = true;
 		}
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceIntegrationTests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceIntegrationTests.java
index 1804624f..5a0eefc8 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceIntegrationTests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceIntegrationTests.java
@@ -161,7 +161,7 @@ public class LdapContextSourceIntegrationTests extends AbstractLdapTemplateInteg
 		}
 	}
 
-	private final static class DnContextMapper extends AbstractContextMapper<String> {
+	private static final class DnContextMapper extends AbstractContextMapper<String> {
 
 		@Override
 		protected String doMapFromContext(DirContextOperations ctx) {
diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap473/Ldap473Tests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap473/Ldap473Tests.java
index a1f61ff4..303c516b 100644
--- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap473/Ldap473Tests.java
+++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap473/Ldap473Tests.java
@@ -50,7 +50,7 @@ public class Ldap473Tests {
 	static class ContextSourceConfig {
 
 		@Bean
-		public ContextSource contextSource() {
+		ContextSource contextSource() {
 			LdapContextSource contextSource = new LdapContextSource();
 			contextSource.setUrl("ldap://localhost:9322");
 			contextSource.setUserDn(null);
@@ -64,7 +64,7 @@ public class Ldap473Tests {
 	static class EmbeddedLdapConfig {
 
 		@Bean
-		public EmbeddedLdapServerFactoryBean embeddedLdapServer() {
+		EmbeddedLdapServerFactoryBean embeddedLdapServer() {
 			EmbeddedLdapServerFactoryBean embeddedLdapServer = new EmbeddedLdapServerFactoryBean();
 			embeddedLdapServer.setPartitionName("example");
 			embeddedLdapServer.setPartitionSuffix("dc=261consulting,dc=com");