diff --git a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/IndexingQueueTest.java b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/IndexingQueueTest.java
index f06af8cc364..be7bada05b7 100644
--- a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/IndexingQueueTest.java
+++ b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/IndexingQueueTest.java
@@ -150,7 +150,7 @@ public void testReaderUpToDate() throws Exception {
         try {
             FileUtil.delete(indexDir);
         } catch (IOException e) {
-            fail("Unable to delete index directory");
+            fail("Unable to delete index directory '" + indexDir + "': " + e.getMessage());
         }
 
         BlockingParser.unblock();
diff --git a/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/fs/local/FileUtil.java b/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/fs/local/FileUtil.java
index 3fe4323198b..5f9b8309748 100644
--- a/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/fs/local/FileUtil.java
+++ b/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/fs/local/FileUtil.java
@@ -93,7 +93,7 @@ public static void delete(File f) throws IOException {
             }
         }
         if (!f.delete()) {
-            throw new IOException("Unable to delete " + f.getPath());
+            throw new IOException("Unable to delete '" + f.getPath() + "'");
         }
     }
 }