diff --git a/src/node/handler/ExportHandler.js b/src/node/handler/ExportHandler.js
index 678519fbc..db3d2d40d 100644
--- a/src/node/handler/ExportHandler.js
+++ b/src/node/handler/ExportHandler.js
@@ -40,13 +40,7 @@ if(settings.abiword != null)
if(settings.soffice != null)
convertor = require("../utils/LibreOffice");
-var tempDirectory = "/tmp";
-
-//tempDirectory changes if the operating system is windows
-if(os.type().indexOf("Windows") > -1)
-{
- tempDirectory = process.env.TEMP;
-}
+const tempDirectory = os.tmpdir();
/**
* do a requested export
diff --git a/src/node/handler/ImportHandler.js b/src/node/handler/ImportHandler.js
index 45c4c6ea8..b08bdcf60 100644
--- a/src/node/handler/ImportHandler.js
+++ b/src/node/handler/ImportHandler.js
@@ -47,8 +47,7 @@ if(settings.soffice != null) {
exportExtension = "html";
}
-//for node 0.6 compatibily, os.tmpDir() only works from 0.8
-var tmpDirectory = process.env.TEMP || process.env.TMPDIR || process.env.TMP || '/tmp';
+const tmpDirectory = os.tmpdir();
/**
* do a requested import
diff --git a/tests/backend/specs/api/tidy.js b/tests/backend/specs/api/tidy.js
index 47cb49f62..6f38ac7b0 100644
--- a/tests/backend/specs/api/tidy.js
+++ b/tests/backend/specs/api/tidy.js
@@ -23,7 +23,8 @@ describe('tidyHtml', function() {
}
// Try to tidy up a bad HTML file
- var tmpDir = process.env.TEMP || "/tmp";
+ const tmpDir = os.tmpdir();
+
var tmpFile = path.join(tmpDir, 'tmp_' + (Math.floor(Math.random() * 1000000)) + '.html')
fs.writeFileSync(tmpFile, 'a paragraph
List without outer ULtrailing closing p');
TidyHtml.tidy(tmpFile, function(err){