diff --git a/common/src/test/java/bisq/common/config/ConfigFileEditorTests.java b/common/src/test/java/bisq/common/config/ConfigFileEditorTests.java
index d1b0ed4f057..4819c1bd840 100644
--- a/common/src/test/java/bisq/common/config/ConfigFileEditorTests.java
+++ b/common/src/test/java/bisq/common/config/ConfigFileEditorTests.java
@@ -29,6 +29,7 @@ public void setUp() throws IOException {
 
     @Test
     public void whenFileDoesNotExist_thenSetOptionCreatesItAndAppendsOneLine() {
+        writer.close();
         assertTrue(file.delete());
 
         editor.setOption("opt1", "val1");
@@ -111,6 +112,7 @@ public void whenFileDoesNotContainOptionBeingCleared_thenClearOptionIsNoOp() {
 
     @Test
     public void whenFileDoesNotExist_thenClearOptionIsNoOp() {
+        writer.close();
         assertTrue(file.delete());
         editor.clearOption("opt1");
         assertFalse(file.exists());
diff --git a/common/src/test/java/bisq/common/config/ConfigFileReaderTests.java b/common/src/test/java/bisq/common/config/ConfigFileReaderTests.java
index ceffb6acae5..e0076bc822b 100644
--- a/common/src/test/java/bisq/common/config/ConfigFileReaderTests.java
+++ b/common/src/test/java/bisq/common/config/ConfigFileReaderTests.java
@@ -32,6 +32,7 @@ public void setUp() throws IOException {
 
     @Test
     public void whenFileDoesNotExist_thenGetLinesThrows() {
+        writer.close();
         assertTrue(file.delete());
 
         exception.expect(ConfigException.class);
diff --git a/common/src/test/java/bisq/common/config/ConfigTests.java b/common/src/test/java/bisq/common/config/ConfigTests.java
index 91554893881..017fe6c9bd1 100644
--- a/common/src/test/java/bisq/common/config/ConfigTests.java
+++ b/common/src/test/java/bisq/common/config/ConfigTests.java
@@ -115,16 +115,24 @@ public void whenUnrecognizedOptionIsSet_thenConfigExceptionIsThrown() {
 
     @Test
     public void whenOptionFileArgumentDoesNotExist_thenConfigExceptionIsThrown() {
+        String filepath = "/does/not/exist";
+        if (System.getProperty("os.name").startsWith("Windows")) {
+            filepath = "C:\\does\\not\\exist";
+        }
         exceptionRule.expect(ConfigException.class);
-        exceptionRule.expectMessage("problem parsing option 'torrcFile': File [/does/not/exist] does not exist");
-        configWithOpts(opt(TORRC_FILE, "/does/not/exist"));
+        exceptionRule.expectMessage(format("problem parsing option 'torrcFile': File [%s] does not exist", filepath));
+        configWithOpts(opt(TORRC_FILE, filepath));
     }
 
     @Test
     public void whenConfigFileOptionIsSetToNonExistentFile_thenConfigExceptionIsThrown() {
+        String filepath = "/no/such/bisq.properties";
+        if (System.getProperty("os.name").startsWith("Windows")) {
+            filepath = "C:\\no\\such\\bisq.properties";
+        }
         exceptionRule.expect(ConfigException.class);
-        exceptionRule.expectMessage("The specified config file '/no/such/bisq.properties' does not exist");
-        configWithOpts(opt(CONFIG_FILE, "/no/such/bisq.properties"));
+        exceptionRule.expectMessage(format("The specified config file '%s' does not exist", filepath));
+        configWithOpts(opt(CONFIG_FILE, filepath));
     }
 
     @Test
diff --git a/common/src/test/java/bisq/common/util/PreconditionsTests.java b/common/src/test/java/bisq/common/util/PreconditionsTests.java
index cd590fba8cb..23616faf47c 100644
--- a/common/src/test/java/bisq/common/util/PreconditionsTests.java
+++ b/common/src/test/java/bisq/common/util/PreconditionsTests.java
@@ -27,8 +27,12 @@ public void whenDirIsValid_thenDirIsReturned() throws IOException {
 
     @Test
     public void whenDirDoesNotExist_thenThrow() {
+        String filepath = "/does/not/exist";
+        if (System.getProperty("os.name").startsWith("Windows")) {
+            filepath = "C:\\does\\not\\exist";
+        }
         exceptionRule.expect(IllegalArgumentException.class);
-        exceptionRule.expectMessage(equalTo("Directory '/does/not/exist' does not exist"));
-        checkDir(new File("/does/not/exist"));
+        exceptionRule.expectMessage(equalTo(String.format("Directory '%s' does not exist", filepath)));
+        checkDir(new File(filepath));
     }
 }