diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6b46e8f829..2c21cfc30e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,6 @@ jobs:
       id: set-matrix
       run: |
         echo "separateTestsNames=$(./gradlew listTasksAsJSON -q --console=plain | tail -n 1)" >> $GITHUB_OUTPUT
-        echo "testsNamesExclude=$(./gradlew listTasksAsParam -q --console=plain | tail -n 1)" >> $GITHUB_OUTPUT
 
   build:
     name: build
@@ -51,7 +50,7 @@ jobs:
       uses: gradle/gradle-build-action@v2
       with:
         arguments: |
-          build citest ${{ needs.generate-test-list.outputs.testsNamesExclude }} -Dbuild.snapshot=false
+          build citest -Dbuild.snapshot=false
           -x integrationTest
           -x spotlessCheck
           -x checkstyleMain
@@ -111,7 +110,6 @@ jobs:
           -x spotbugsMain
           -x spotbugsIntegrationTest
           -x checkstyleIntegrationTest
-          -x citest
           -x test
 
     - uses: actions/upload-artifact@v3
diff --git a/build.gradle b/build.gradle
index 8b63fd266a..33c378ff71 100644
--- a/build.gradle
+++ b/build.gradle
@@ -190,6 +190,26 @@ test {
     }
 }
 
+task copyExtraTestResources(dependsOn: testClasses) {
+
+    copy {
+        from 'src/test/resources'
+        into 'build/testrun/test/src/test/resources'
+    }
+
+    taskNames.each { testName ->
+        copy {
+            from 'src/test/resources'
+            into "build/testrun/${testName}/src/test/resources"
+        }
+    }
+
+    copy {
+        from 'src/test/resources'
+        into 'build/testrun/citest/src/test/resources'
+    }
+}
+
 task citest(type: Test) {
 //    onlyIf { !project.gradle.taskGraph.hasTask(':test') }
     include '**/*.class'
@@ -233,6 +253,7 @@ task citest(type: Test) {
                 "sun.util.resources.provider.*"
         ]
     }
+    dependsOn copyExtraTestResources
 }
 
 splitTestConfig.each{ testName, filterCfg ->
@@ -269,17 +290,11 @@ splitTestConfig.each{ testName, filterCfg ->
                 "sun.util.resources.provider.*"
             ]
         }
+        dependsOn copyExtraTestResources
     }
 }
 
-task copyExtraTestResources(dependsOn: testClasses) {
-    copy {
-        from 'src/test/resources'
-        into 'build/testrun/test/src/test/resources'
-    }
-}
 tasks.test.dependsOn(copyExtraTestResources)
-tasks.citest.dependsOn(copyExtraTestResources, taskNames)
 
 jacoco {
     reportsDirectory = file("$buildDir/reports/jacoco")