diff --git a/.github/workflows/github_autotools_intel.yml b/.github/workflows/github_autotools_intel.yml
index 851ad71520..1a1d588415 100644
--- a/.github/workflows/github_autotools_intel.yml
+++ b/.github/workflows/github_autotools_intel.yml
@@ -1,29 +1,22 @@
 on: pull_request
 jobs:
-  intel-autotools:
+  build-dependencies:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        io-flag: ["--disable-deprecated-io", "--enable-deprecated-io"]
     container:
       image: intel/oneapi-hpckit:2023.1.0-devel-ubuntu20.04
       env:
         CC: mpiicc
         FC: mpiifort
         CFLAGS:  "-I/libs/include"
-        FCFLAGS: "-I/libs/include -g -traceback ${{ matrix.io-flag }}"
+        FCFLAGS: "-I/libs/include -g -traceback"
         LDFLAGS: "-L/libs/lib"
-        TEST_VERBOSE: 1
-        I_MPI_FABRICS: "shm" # needed for mpi in image
-        # intel bug causes some failures with shm option(required in container)
-        SKIP_TESTS: "test_mpp_update_domains.1 test_update_domains_performance.1 test_diag_manager2.23"
     steps:
     - name: Cache dependencies
       id: cache
       uses: actions/cache@v3
       with:
         path: /libs
-        key: ${{ runner.os }}-intel-libs
+        key: ${{ runner.os }}-intel-libs${{ matrix.io-flag }}
     - name: Install packages for building
       run: apt-get update && apt-get install -y autoconf libtool automake zlibc zlib1g-dev
     - if: steps.cache.outputs.cache-hit != 'true'
@@ -46,11 +39,44 @@ jobs:
         tar xf yaml-0.2.5.tar.gz && cd yaml-0.2.5
         ./configure --prefix=/libs
         make -j install && cd
+  make-check-fms:
+    needs: build-dependencies
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        FC: ["ifx", "ifort"]
+        CC: ["icx", "icc"]
+        io-flag: ["--disable-deprecated-io", "--enable-deprecated-io"]
+        exclude:
+          - FC: "ifx"
+            CC: "icc"
+    container:
+      image: intel/oneapi-hpckit:2023.1.0-devel-ubuntu20.04
+      env:
+        CC: mpicc -cc=${{ matrix.CC }}
+        FC: mpifc -fc=${{ matrix.FC }}
+        CFLAGS:  "-I/libs/include"
+        FCFLAGS: "-I/libs/include -g -traceback"
+        LDFLAGS: "-L/libs/lib"
+        TEST_VERBOSE: 1
+        I_MPI_FABRICS: "shm" # needed for mpi in image
+        # intel bug causes some failures with shm option(required in container)
+        # test without skips
+        #SKIP_TESTS: "test_mpp_update_domains.1 test_update_domains_performance.1 test_diag_manager2.23"
+    steps:
+    - name: Get dependencies from cache
+      id: cache
+      uses: actions/cache@v3
+      with:
+        path: /libs
+        key: ${{ runner.os }}-intel-libs
+    - name: Install packages for building
+      run: apt-get update && apt-get install -y autoconf libtool automake zlibc zlib1g-dev zip
     - name: checkout
       uses: actions/checkout@v2
     - name: Configure
-      run: autoreconf -if ./configure.ac && ./configure --with-yaml
+      run: autoreconf -if ./configure.ac && ./configure --with-yaml ${{ matrix.io-flag }}
     - name: Compile
       run: make -j || make
     - name: Run test suite
-      run: make check LD_LIBRARY_PATH="/libs/lib:$LD_LIBRARY_PATH" TEST_VERBOSE=1
+      run: make distcheck LD_LIBRARY_PATH="/libs/lib:$LD_LIBRARY_PATH" TEST_VERBOSE=1