diff --git a/.github/workflows/_integration_tests.yml b/.github/workflows/_integration_tests.yml
index dfcbf621..c3714d22 100644
--- a/.github/workflows/_integration_tests.yml
+++ b/.github/workflows/_integration_tests.yml
@@ -10,6 +10,7 @@ jobs:
         node-version: [16.x, 18.x]
         es-version: [7.6.1]
         jdk-version: [oraclejdk11]
+        icuTokenizer: [true, false]
     steps:
     - uses: actions/checkout@v2
     - name: Install node.js ${{ matrix.node-version }}
@@ -23,6 +24,10 @@ jobs:
       run: ./scripts/setup_ci.sh
     - name: Run integration tests
       run: |
+        if [ "${{ matrix.icuTokenizer }}" = "true" ]; then
+          jq -n '{ schema: { icuTokenizer: true } }' > $(pwd)/config-icu.json
+          export PELIAS_CONFIG=$(pwd)/config-icu.json
+        fi
         npm install
         curl http://127.0.0.1:9200/
         ./bin/create_index
diff --git a/.github/workflows/_unit_tests.yml b/.github/workflows/_unit_tests.yml
index 315e8481..789468a2 100644
--- a/.github/workflows/_unit_tests.yml
+++ b/.github/workflows/_unit_tests.yml
@@ -8,21 +8,20 @@ jobs:
         os:
           - ${{ vars.UBUNTU_VERSION }}
         node-version: [16.x, 18.x]
+        icuTokenizer: [true, false]
     steps:
     - uses: actions/checkout@v2
     - name: Install node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v2-beta
       with:
         node-version: ${{ matrix.node-version }}
-    - name: Install dependencies
-      run: npm install
     - name: Run unit tests
       run: |
+        npm install
+        if [ "${{ matrix.icuTokenizer }}" = "true" ]; then
+          jq -n '{ schema: { icuTokenizer: true } }' > $(pwd)/config-icu.json
+          export PELIAS_CONFIG=$(pwd)/config-icu.json
+        fi
         npm run test
-    - name: Run unit tests with icuTokenizer = true
-      run: |
-        jq -n '{ schema: { icuTokenizer: true } }' > $(pwd)/config-icu.json
-        export PELIAS_CONFIG=$(pwd)/config-icu.json
-        npm run test
-        rm $(pwd)/config-icu.json
+