Index: jackrabbit-jca/src/test/java/org/apache/jackrabbit/jca/test/AbstractTestCase.java
===================================================================
--- jackrabbit-jca/src/test/java/org/apache/jackrabbit/jca/test/AbstractTestCase.java	(revision 923309)
+++ jackrabbit-jca/src/test/java/org/apache/jackrabbit/jca/test/AbstractTestCase.java	(revision )
@@ -16,18 +16,12 @@
  */
 package org.apache.jackrabbit.jca.test;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-
 import junit.framework.TestCase;
-
-import org.apache.jackrabbit.core.RepositoryImpl;
 import org.apache.jackrabbit.jca.JCAManagedConnectionFactory;
 
 import javax.jcr.Credentials;
 import javax.jcr.SimpleCredentials;
+import java.io.File;
 
 /**
  * This implements the abstract test case.
@@ -50,7 +44,7 @@
      * Default credentials.
      */
     public static final Credentials JCR_SUPERUSER =
-            new SimpleCredentials("superuser", new char[0]);
+            new SimpleCredentials("admin", "admin".toCharArray());
 
     /**
      * Anonymous credentials.
Index: jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/RepositoryConfigTest.java
===================================================================
--- jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/RepositoryConfigTest.java	(revision 886191)
+++ jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/RepositoryConfigTest.java	(revision )
@@ -206,7 +206,7 @@
         SecurityManagerConfig smc =
             config.getSecurityConfig().getSecurityManagerConfig();
         assertEquals(
-                "org.apache.jackrabbit.core.security.simple.SimpleSecurityManager",
+                "org.apache.jackrabbit.core.DefaultSecurityManager",
                 smc.getClassName());
         assertTrue(smc.getParameters().isEmpty());
         assertNotNull(smc.getWorkspaceName());
Index: jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/repository.xml
===================================================================
--- jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/repository.xml	(revision 887163)
+++ jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/repository.xml	(revision )
@@ -47,7 +47,7 @@
             security manager:
             class: FQN of class implementing the JackrabbitSecurityManager interface
         -->
-        <SecurityManager class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager" workspaceName="security">
+        <SecurityManager class="org.apache.jackrabbit.core.DefaultSecurityManager" workspaceName="security">
             <!--
             workspace access:
             class: FQN of class implementing the WorkspaceAccessManager interface
Index: jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/cluster/repository.xml
===================================================================
--- jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/cluster/repository.xml	(revision 886191)
+++ jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/cluster/repository.xml	(revision )
@@ -39,7 +39,7 @@
             security manager:
             class: FQN of class implementing the JackrabbitSecurityManager interface
         -->
-        <SecurityManager class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager" workspaceName="security">
+        <SecurityManager class="org.apache.jackrabbit.core.DefaultSecurityManager" workspaceName="security">
             <!--
             workspace access:
             class: FQN of class implementing the WorkspaceAccessManager interface
Index: jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/DataStoreAPITest.java
===================================================================
--- jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/DataStoreAPITest.java	(revision 927314)
+++ jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/DataStoreAPITest.java	(revision )
@@ -16,16 +16,7 @@
  */
 package org.apache.jackrabbit.core.data;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Properties;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-import javax.jcr.SimpleCredentials;
-
 import junit.framework.TestCase;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.jackrabbit.api.JackrabbitRepository;
 import org.apache.jackrabbit.api.JackrabbitRepositoryFactory;
@@ -33,6 +24,12 @@
 import org.apache.jackrabbit.api.management.RepositoryManager;
 import org.apache.jackrabbit.core.RepositoryFactoryImpl;
 
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import java.io.File;
+import java.io.IOException;
+import java.util.Properties;
+
 /**
  * Test data store garbage collection as described in the wiki at
  * http://wiki.apache.org/jackrabbit/DataStore
@@ -53,7 +50,7 @@
         RepositoryManager rm = rf.getRepositoryManager(rep);
 
         // need to login to start the repository
-        Session session = rep.login(new SimpleCredentials("", "".toCharArray()));
+        Session session = rep.login();
 
         DataStoreGarbageCollector gc = rm.createDataStoreGarbageCollector();
         try {