diff --git a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java
index 238945595a797..3e59ffca273dc 100644
--- a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java
+++ b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java
@@ -71,20 +71,19 @@ protected Context createJndiContext() throws Exception {
             user = userManager.createUser("test", "quatloos");
         }
         // set up permissions
-        String permissionsPath = session.getRootNode().getPath();
+        String path = session.getRootNode().getPath();
         AccessControlManager accessControlManager = session
                 .getAccessControlManager();
         AccessControlPolicyIterator acls = accessControlManager
-                .getApplicablePolicies(permissionsPath);
+                .getApplicablePolicies(path);
+        AccessControlList acl = null;
         if (acls.hasNext()) {
-            AccessControlList acl = (AccessControlList) acls.nextAccessControlPolicy();
-            acl.addAccessControlEntry(user.getPrincipal(), accessControlManager
-                    .getSupportedPrivileges(permissionsPath));
-            accessControlManager.setPolicy(permissionsPath, acl);
+            acl = (AccessControlList) acls.nextAccessControlPolicy();
         } else {
-            throw new Exception("could not set access control for path "
-                    + permissionsPath);
+            acl = (AccessControlList) accessControlManager.getPolicies(path)[0];
         }
+        acl.addAccessControlEntry(user.getPrincipal(), accessControlManager.getSupportedPrivileges(path));
+        accessControlManager.setPolicy(path, acl);
 
         session.save();
         session.logout();
diff --git a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTokenWithLoginTest.java b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTokenLoginFailureTest.java
similarity index 90%
rename from components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTokenWithLoginTest.java
rename to components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTokenLoginFailureTest.java
index e1dee1acacc46..e830db3b7c989 100644
--- a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTokenWithLoginTest.java
+++ b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTokenLoginFailureTest.java
@@ -16,21 +16,22 @@
  */
 package org.apache.camel.component.jcr;
 
+import javax.jcr.LoginException;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Ignore;
 import org.junit.Test;
 
-public class JcrAuthTokenWithLoginTest extends JcrAuthTestBase {
+public class JcrAuthTokenLoginFailureTest extends JcrAuthTestBase {
 
     @Test
-    @Ignore("Fails with some error")
     public void testCreateNodeWithAuthentication() throws Exception {
         Exchange exchange = createExchangeWithBody("<message>hello!</message>");
         Exchange out = template.send("direct:a", exchange);
         assertNotNull(out);
         String uuid = out.getOut().getBody(String.class);
         assertNull("Expected body to be null, found JCR node UUID", uuid);
+        assertTrue("Wrong exception type", out.getException() instanceof LoginException);
     }
 
     @Override
diff --git a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/AuthTokenLoginFailureTest.java b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTokenLoginTest.java
similarity index 94%
rename from components/camel-jcr/src/test/java/org/apache/camel/component/jcr/AuthTokenLoginFailureTest.java
rename to components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTokenLoginTest.java
index 406bf2c6b4222..69c5647045de5 100644
--- a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/AuthTokenLoginFailureTest.java
+++ b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTokenLoginTest.java
@@ -22,13 +22,11 @@
 
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
-import org.junit.Ignore;
 import org.junit.Test;
 
-public class AuthTokenLoginFailureTest extends JcrAuthTestBase {
+public class JcrAuthTokenLoginTest extends JcrAuthTestBase {
 
     @Test
-    @Ignore("Fails with some error")
     public void testCreateNodeWithAuthentication() throws Exception {
         Exchange exchange = createExchangeWithBody("<message>hello!</message>");
         Exchange out = template.send("direct:a", exchange);