diff --git a/core/src/main/java/com/webcohesion/enunciate/Enunciate.java b/core/src/main/java/com/webcohesion/enunciate/Enunciate.java
index 9343c99a9..40fd66853 100644
--- a/core/src/main/java/com/webcohesion/enunciate/Enunciate.java
+++ b/core/src/main/java/com/webcohesion/enunciate/Enunciate.java
@@ -33,6 +33,7 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.nio.channels.FileChannel;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -324,9 +325,7 @@ public File createTempDir() throws IOException {
       scratchDir.mkdirs();
     }
 
-    final File tempDir = File.createTempFile("enunciate" + random.intValue(), "", scratchDir);
-    tempDir.delete();
-    tempDir.mkdirs();
+    final File tempDir = Files.createTempDirectory(scratchDir.toPath(), "enunciate" + random.intValue()).toFile();
 
     getLogger().debug("Created directory %s", tempDir);
 
diff --git a/core/src/test/java/com/webcohesion/enunciate/EnunciateTest.java b/core/src/test/java/com/webcohesion/enunciate/EnunciateTest.java
index 77aba7d88..c4365473c 100644
--- a/core/src/test/java/com/webcohesion/enunciate/EnunciateTest.java
+++ b/core/src/test/java/com/webcohesion/enunciate/EnunciateTest.java
@@ -23,6 +23,7 @@
 import java.io.OutputStream;
 import java.net.URI;
 import java.net.URL;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -209,9 +210,7 @@ protected void buildFileList(List<File> list, File... dirs) {
 
   private File createTempDir() throws IOException {
     final Double random = Math.random() * 10000; //this random name is applied to avoid an "access denied" error on windows.
-    final File tempDir = File.createTempFile("EnunciateTest" + random.intValue(), "");
-    tempDir.delete();
-    tempDir.mkdirs();
+    final File tempDir = Files.createTempDirectory("EnunciateTest" + random.intValue()).toFile();
     return tempDir;
   }