diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/server/TestZooKeeperStateServer.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/server/TestZooKeeperStateServer.java
index ff12c7e255..78e735c691 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/server/TestZooKeeperStateServer.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/state/server/TestZooKeeperStateServer.java
@@ -49,7 +49,7 @@ public class TestZooKeeperStateServer {
 
     @BeforeClass
     public static void setup() throws IOException, ConfigException {
-        tempDir = Paths.get("target/TestZooKeeperStateServer");
+        tempDir = Paths.get("target", "TestZooKeeperStateServer");
         dataDir = tempDir.resolve("state");
         zkServerConfig = tempDir.resolve("zookeeper.properties");
         clientPort = InstanceSpec.getRandomPort();
diff --git a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/test/java/org/apache/nifi/processors/groovyx/ExecuteGroovyScriptTest.java b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/test/java/org/apache/nifi/processors/groovyx/ExecuteGroovyScriptTest.java
index 473a4802c9..32cb6a62ad 100644
--- a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/test/java/org/apache/nifi/processors/groovyx/ExecuteGroovyScriptTest.java
+++ b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/test/java/org/apache/nifi/processors/groovyx/ExecuteGroovyScriptTest.java
@@ -105,7 +105,7 @@ public class ExecuteGroovyScriptTest {
         Assume.assumeTrue("Test only runs on *nix", !SystemUtils.IS_OS_WINDOWS);
         FileUtils.copyDirectory(new File("src/test/resources"), new File("target/test/resources"));
         //prepare database connection
-        System.setProperty("derby.stream.error.file", "target/derby.log");
+        System.setProperty("derby.stream.error.file", "target" + File.separator + "derby.log");
 
         // remove previous test database, if any
         final File dbLocation = new File(DB_LOCATION);