diff --git a/.github/workflows/check-ci.yml b/.github/workflows/check-ci.yml
index 8069b1676b7..efecdbaedd4 100644
--- a/.github/workflows/check-ci.yml
+++ b/.github/workflows/check-ci.yml
@@ -65,5 +65,5 @@ jobs:
         if: failure()
         with:
           name: check-ci-jvm-err
-          path: '*_pid*.log'
+          path: '**/*_pid*.log'
           if-no-files-found: ignore
diff --git a/.github/workflows/long-check-ci.yml b/.github/workflows/long-check-ci.yml
index c20101bdea9..5fd4f339625 100644
--- a/.github/workflows/long-check-ci.yml
+++ b/.github/workflows/long-check-ci.yml
@@ -61,5 +61,5 @@ jobs:
         if: failure()
         with:
           name: long-check-ci-jvm-err
-          path: '*_pid*.log'
+          path: '**/*_pid*.log'
           if-no-files-found: ignore
\ No newline at end of file
diff --git a/.github/workflows/nightly-check-ci.yml b/.github/workflows/nightly-check-ci.yml
index 8cf9c524c10..eed1b5f4739 100644
--- a/.github/workflows/nightly-check-ci.yml
+++ b/.github/workflows/nightly-check-ci.yml
@@ -65,7 +65,7 @@ jobs:
         if: failure()
         with:
           name: nightly-check-ci-jvm-err
-          path: '*_pid*.log'
+          path: '**/*_pid*.log'
           if-no-files-found: ignore
 
       - name: Publish Test Results
@@ -141,7 +141,7 @@ jobs:
         if: failure()
         with:
           name: nightly-testSerial-ci-jvm-err
-          path: '*_pid*.log'
+          path: '**/*_pid*.log'
           if-no-files-found: ignore
 
       - name: Publish Test Results
@@ -217,7 +217,7 @@ jobs:
         if: failure()
         with:
           name: nightly-testParallel-ci-jvm-err
-          path: '*_pid*.log'
+          path: '**/*_pid*.log'
           if-no-files-found: ignore
 
       - name: Publish Test Results
@@ -293,7 +293,7 @@ jobs:
         if: failure()
         with:
           name: nightly-testOutOfBand-ci-jvm-err
-          path: '*_pid*.log'
+          path: '**/*_pid*.log'
           if-no-files-found: ignore
 
       - name: Publish Test Results
diff --git a/Configuration/build.gradle b/Configuration/build.gradle
index cda6912dd98..db8f79a195f 100644
--- a/Configuration/build.gradle
+++ b/Configuration/build.gradle
@@ -24,7 +24,6 @@ sourceSets {
 test {
     useJUnit()
 
-    workingDir = "$rootDir"
     enableAssertions = true
     maxHeapSize = '3g'
 
diff --git a/Net/build.gradle b/Net/build.gradle
index 895478f6550..f664b1ef693 100644
--- a/Net/build.gradle
+++ b/Net/build.gradle
@@ -11,7 +11,6 @@ dependencies {
 test {
     useJUnit()
 
-    workingDir = "$rootDir"
     enableAssertions = true
     maxHeapSize = '3g'
 
diff --git a/Stats/build.gradle b/Stats/build.gradle
index d36fe197807..d86526bbb2f 100644
--- a/Stats/build.gradle
+++ b/Stats/build.gradle
@@ -12,7 +12,6 @@ dependencies {
 test {
     useJUnit()
 
-    workingDir = "$rootDir"
     enableAssertions = true
     maxHeapSize = '3g'
 
diff --git a/build.gradle b/build.gradle
index 42f5451b83b..7cc13c40d80 100644
--- a/build.gradle
+++ b/build.gradle
@@ -216,8 +216,6 @@ configure modsRegular,
 
         useJUnit()
 
-        workingDir = "$rootDir/.."
-
         new File("$rootDir/tmp/workspace".toString()).mkdirs()
         new File("$rootDir/tmp/logs".toString()).mkdirs()