diff --git a/core/src/main/java/org/springframework/security/config/ApacheDSContainer.java b/core/src/main/java/org/springframework/security/config/ApacheDSContainer.java
index 98e99867fd..8181762124 100644
--- a/core/src/main/java/org/springframework/security/config/ApacheDSContainer.java
+++ b/core/src/main/java/org/springframework/security/config/ApacheDSContainer.java
@@ -151,7 +151,7 @@ class ApacheDSContainer implements InitializingBean, DisposableBean, Lifecycle,
 
     private void importLdifs() throws IOException, NamingException {
         // Import any ldif files
-        Resource[] ldifs = ctxt.getResources("classpath:*.ldif");
+        Resource[] ldifs = ctxt.getResources("classpath*:*.ldif");
 
         // Note that we can't just import using the ServerContext returned
         // from starting Apace DS, apparently because of the long-running issue DIRSERVER-169.
diff --git a/core/src/test/resources/log4j.properties b/core/src/test/resources/log4j.properties
index f00c448d9c..065156f6fe 100644
--- a/core/src/test/resources/log4j.properties
+++ b/core/src/test/resources/log4j.properties
@@ -2,7 +2,7 @@
 #
 # $Id$
 
-log4j.rootCategory=DEBUG, stdout
+log4j.rootCategory=INFO, stdout
 
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout