diff --git a/test-unit/org/jivesoftware/smackx/entitycaps/EntityCapsManagerTest.java b/test-unit/org/jivesoftware/smackx/entitycaps/EntityCapsManagerTest.java
index 754bf6d3c..5ae4642a9 100644
--- a/test-unit/org/jivesoftware/smackx/entitycaps/EntityCapsManagerTest.java
+++ b/test-unit/org/jivesoftware/smackx/entitycaps/EntityCapsManagerTest.java
@@ -216,9 +216,7 @@ public class EntityCapsManagerTest {
     }
 
     public static File createTempDirectory() throws IOException {
-        String tmpdir = System.getProperty("java.io.tmpdir");
-        File tmp;
-        tmp = File.createTempFile(tmpdir, "entityCaps");
+        File tmp = File.createTempFile("entity", "caps");
         tmp.delete();
         tmp.mkdir();
         return tmp;