2 files changed, 8 insertions, 17 deletions
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/TempFileUtils.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/TempFileUtils.java
index c0e6e3b2e7f..f1cefb84994 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/TempFileUtils.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/TempFileUtils.java
@@ -21,6 +21,8 @@ package org.sonar.api.utils;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 
 /**
  * @deprecated since 4.0 use {@link TempFolder}
@@ -48,14 +50,7 @@ public final class TempFileUtils {
   }
 
   public static File createTempDirectory(String prefix) throws IOException {
-    final File temp = File.createTempFile(prefix, Long.toString(System.nanoTime()));
-    if (!temp.delete()) {
-      throw new IOException("Could not delete temp file: " + temp.getAbsolutePath());
-    }
-
-    if (!temp.mkdir()) {
-      throw new IOException("Could not create temp directory: " + temp.getAbsolutePath());
-    }
-    return temp;
+    Path dir = Files.createTempDirectory(prefix);
+    return dir.toFile();
   }
 }
diff --git a/sonar-testing-harness/src/main/java/org/sonar/test/TestUtils.java b/sonar-testing-harness/src/main/java/org/sonar/test/TestUtils.java
index 31e9e24cfef..ba4728675ab 100644
--- a/sonar-testing-harness/src/main/java/org/sonar/test/TestUtils.java
+++ b/sonar-testing-harness/src/main/java/org/sonar/test/TestUtils.java
@@ -19,13 +19,13 @@
  */
 package org.sonar.test;
 
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
-
 import java.io.File;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Modifier;
 import java.net.URL;
+import java.nio.file.Files;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
 
 /**
  * Utilities for unit tests
@@ -93,11 +93,7 @@ public final class TestUtils {
 
   public static File newTempDir(String prefix) {
     try {
-      // Technique to create a temp directory from a temp file
-      File f = File.createTempFile(prefix, "");
-      f.delete();
-      f.mkdir();
-      return f;
+      return Files.createTempDirectory(prefix).toFile();
     } catch (Exception e) {
       throw new IllegalStateException("Fail to create temp dir", e);
     }