diff --git a/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/AbstractJCRTest.java b/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/AbstractJCRTest.java
index 5cc11714610..f3227e4e2cb 100644
--- a/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/AbstractJCRTest.java
+++ b/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/AbstractJCRTest.java
@@ -32,7 +32,6 @@
 import javax.jcr.ValueFactory;
 import javax.jcr.nodetype.NoSuchNodeTypeException;
 import javax.jcr.nodetype.NodeDefinition;
-import javax.jcr.nodetype.ConstraintViolationException;
 import javax.jcr.nodetype.NodeType;
 import javax.jcr.nodetype.PropertyDefinition;
 import javax.jcr.retention.RetentionManager;
@@ -897,7 +896,7 @@ protected Node cleanUpTestRoot(Session s) throws RepositoryException {
                     // try to remove child
                     try {
                         child.remove();
-                    } catch (ConstraintViolationException e) {
+                    } catch (RepositoryException e) {
                         log.println("unable to remove node: " + child.getPath());
                     }
                 }