diff --git a/core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java b/core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java
index b79c955494..812dd26576 100644
--- a/core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java
+++ b/core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java
@@ -18,17 +18,13 @@ package org.acegisecurity.providers.dao;
 import org.acegisecurity.AuthenticationException;
 import org.acegisecurity.AuthenticationServiceException;
 import org.acegisecurity.BadCredentialsException;
-
 import org.acegisecurity.providers.AuthenticationProvider;
 import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 import org.acegisecurity.providers.encoding.PasswordEncoder;
 import org.acegisecurity.providers.encoding.PlaintextPasswordEncoder;
-import org.acegisecurity.userdetails.UserDetailsService;
 import org.acegisecurity.userdetails.UserDetails;
-import org.acegisecurity.userdetails.UsernameNotFoundException;
-
+import org.acegisecurity.userdetails.UserDetailsService;
 import org.springframework.dao.DataAccessException;
-
 import org.springframework.util.Assert;
 
 
diff --git a/core/src/main/java/org/acegisecurity/providers/ldap/InitialDirContextFactory.java b/core/src/main/java/org/acegisecurity/providers/ldap/InitialDirContextFactory.java
index 33a4b97097..b6f93d8c7b 100644
--- a/core/src/main/java/org/acegisecurity/providers/ldap/InitialDirContextFactory.java
+++ b/core/src/main/java/org/acegisecurity/providers/ldap/InitialDirContextFactory.java
@@ -15,7 +15,6 @@
 
 package org.acegisecurity.providers.ldap;
 
-import javax.naming.directory.InitialDirContext;
 import javax.naming.directory.DirContext;
 
 /**
diff --git a/core/src/test/java/org/acegisecurity/providers/UsernamePasswordAuthenticationTokenTests.java b/core/src/test/java/org/acegisecurity/providers/UsernamePasswordAuthenticationTokenTests.java
index 118617dabc..c69838a3e1 100644
--- a/core/src/test/java/org/acegisecurity/providers/UsernamePasswordAuthenticationTokenTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/UsernamePasswordAuthenticationTokenTests.java
@@ -92,7 +92,7 @@ public class UsernamePasswordAuthenticationTokenTests extends TestCase {
         Class clazz = UsernamePasswordAuthenticationToken.class;
 
         try {
-            clazz.getDeclaredConstructor(null);
+            clazz.getDeclaredConstructor((Class[])null);
             fail("Should have thrown NoSuchMethodException");
         } catch (NoSuchMethodException expected) {
             assertTrue(true);
diff --git a/core/src/test/java/org/acegisecurity/userdetails/jdbc/JdbcDaoTests.java b/core/src/test/java/org/acegisecurity/userdetails/jdbc/JdbcDaoTests.java
index 6afb6c1b98..6ee1c73392 100644
--- a/core/src/test/java/org/acegisecurity/userdetails/jdbc/JdbcDaoTests.java
+++ b/core/src/test/java/org/acegisecurity/userdetails/jdbc/JdbcDaoTests.java
@@ -15,20 +15,17 @@
 
 package org.acegisecurity.userdetails.jdbc;
 
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashSet;
+
 import junit.framework.TestCase;
 
 import org.acegisecurity.PopulatedDatabase;
 import org.acegisecurity.userdetails.UserDetails;
 import org.acegisecurity.userdetails.UsernameNotFoundException;
-import org.acegisecurity.userdetails.jdbc.JdbcDaoImpl;
-
 import org.springframework.jdbc.object.MappingSqlQuery;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.HashSet;
-
 
 /**
  * Tests {@link JdbcDaoImpl}.
diff --git a/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/support/EmbeddedLdapServerController.java b/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/support/EmbeddedLdapServerController.java
index 108cc02bfa..43dc11317d 100644
--- a/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/support/EmbeddedLdapServerController.java
+++ b/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/support/EmbeddedLdapServerController.java
@@ -15,34 +15,29 @@
 package org.acegisecurity.providers.dao.ldap.support;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Hashtable;
 import java.util.Properties;
 
 import javax.naming.Context;
+import javax.naming.InitialContext;
 import javax.naming.Name;
 import javax.naming.NamingException;
-import javax.naming.InitialContext;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.InitialDirContext;
 
+import org.acegisecurity.providers.ldap.LdapUtils;
 import org.apache.ldap.common.ldif.LdifIterator;
 import org.apache.ldap.common.ldif.LdifParser;
 import org.apache.ldap.common.ldif.LdifParserImpl;
 import org.apache.ldap.common.message.LockableAttributesImpl;
 import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.server.jndi.CoreContextFactory;
-import org.apache.ldap.server.jndi.ServerContextFactory;
-import org.apache.ldap.server.configuration.MutableStartupConfiguration;
+import org.apache.ldap.server.DirectoryService;
 import org.apache.ldap.server.configuration.MutableServerStartupConfiguration;
 import org.apache.ldap.server.configuration.ShutdownConfiguration;
-import org.apache.ldap.server.DirectoryService;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.ClassPathResource;
-import org.acegisecurity.providers.ldap.LdapUtils;
+import org.apache.ldap.server.jndi.ServerContextFactory;
 
 /**
  * Used as static field in BaseLdapTestCase;