diff --git a/.github/workflows/idefix-ci-jobs.yml b/.github/workflows/idefix-ci-jobs.yml
index 7462d11e..b31bf190 100644
--- a/.github/workflows/idefix-ci-jobs.yml
+++ b/.github/workflows/idefix-ci-jobs.yml
@@ -4,6 +4,9 @@ on:
       TESTME_OPTIONS:
         required: true
         type: string
+      IDEFIX_TARGET:
+        required: true
+        type: string
 
 # concurrency:
 #   # auto-cancel any concurrent job *in the same context*
@@ -13,6 +16,7 @@ on:
 #   cancel-in-progress: true
 
 env:
+  IDEFIX_COMPILER: ${{ inputs.IDEFIX_COMPILER }}
   TESTME_OPTIONS: ${{ inputs.TESTME_OPTIONS }}
   PYTHONPATH: ${{ github.workspace }}
   IDEFIX_DIR: ${{ github.workspace }}
@@ -40,17 +44,11 @@ jobs:
         with:
           submodules: recursive
       - name: Sod test
-        run: |
-          cd $IDEFIX_DIR/test/HD/sod
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/sod -all $TESTME_OPTIONS
       - name: Isothermal Sod test
-        run: |
-          cd $IDEFIX_DIR/test/HD/sod-iso
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/sod-iso -all $TESTME_OPTIONS
       - name: Mach reflection test
-        run: |
-          cd $IDEFIX_DIR/test/HD//MachReflection
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/HD//MachReflection -all $TESTME_OPTIONS
 
   ParabolicHydro:
     needs: Linter
@@ -61,17 +59,11 @@ jobs:
         with:
           submodules: recursive
       - name: Viscous flow past cylinder
-        run: |
-          cd $IDEFIX_DIR/test/HD/ViscousFlowPastCylinder
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/ViscousFlowPastCylinder -all $TESTME_OPTIONS
       - name: Viscous disk
-        run: |
-          cd $IDEFIX_DIR/test/HD/ViscousDisk
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/ViscousDisk -all $TESTME_OPTIONS
       - name: Thermal diffusion
-        run: |
-          cd $IDEFIX_DIR/test/HD/thermalDiffusion
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/thermalDiffusion -all $TESTME_OPTIONS
 
   ShocksMHD:
     needs: Linter
@@ -82,22 +74,13 @@ jobs:
         with:
           submodules: recursive
       - name: MHD Sod test
-        run: |
-          cd $IDEFIX_DIR/test/MHD/sod
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/sod -all $TESTME_OPTIONS
       - name: MHD Isothermal Sod test
-        run: |
-          cd $IDEFIX_DIR/test/MHD/sod-iso
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/sod-iso -all $TESTME_OPTIONS
       - name: Orszag Tang
-        run: |
-          cd $IDEFIX_DIR/test/MHD/OrszagTang
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/OrszagTang -all $TESTME_OPTIONS
       - name: Orszag Tang 3D+restart tests
-        run: |
-          cd $IDEFIX_DIR/test/MHD/OrszagTang3D
-          ./testme.py -all $TESTME_OPTIONS
-
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/OrszagTang3D -all $TESTME_OPTIONS
 
   ParabolicMHD:
     needs: Linter
@@ -108,25 +91,15 @@ jobs:
         with:
           submodules: recursive
       - name: Ambipolar C Shock
-        run: |
-          cd $IDEFIX_DIR/test/MHD/AmbipolarCshock
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/AmbipolarCshock -all $TESTME_OPTIONS
       - name: Ambipolar C Shock 3D
-        run: |
-          cd $IDEFIX_DIR/test/MHD/AmbipolarCshock3D
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/AmbipolarCshock3D -all $TESTME_OPTIONS
       - name: Resistive Alfvén wave
-        run: |
-          cd $IDEFIX_DIR/test/MHD/ResistiveAlfvenWave
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/ResistiveAlfvenWave -all $TESTME_OPTIONS
       - name: Grid coarsening diffusion
-        run: |
-          cd $IDEFIX_DIR/test/MHD/Coarsening
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/Coarsening -all $TESTME_OPTIONS
       - name: Hall whistler waves
-        run: |
-          cd $IDEFIX_DIR/test/MHD/HallWhistler
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/HallWhistler -all $TESTME_OPTIONS
 
   Fargo:
     needs: [Linter, ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD]
@@ -137,13 +110,9 @@ jobs:
         with:
           submodules: recursive
       - name: Fargo + planet
-        run: |
-          cd $IDEFIX_DIR/test/HD/FargoPlanet
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/FargoPlanet -all $TESTME_OPTIONS
       - name: Fargo MHD spherical
-        run: |
-          cd $IDEFIX_DIR/test/MHD/FargoMHDSpherical
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/FargoMHDSpherical -all $TESTME_OPTIONS
 
   ShearingBox:
     needs: [Linter, ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD]
@@ -154,13 +123,9 @@ jobs:
         with:
           submodules: recursive
       - name: Hydro shearing box
-        run: |
-          cd $IDEFIX_DIR/test/HD/ShearingBox
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/ShearingBox -all $TESTME_OPTIONS
       - name: MHD shearing box
-        run: |
-          cd $IDEFIX_DIR/test/MHD/ShearingBox
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/ShearingBox -all $TESTME_OPTIONS
 
   SelfGravity:
     needs: [Linter, ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD]
@@ -171,25 +136,15 @@ jobs:
         with:
           submodules: recursive
       - name: Jeans Instability
-        run: |
-          cd $IDEFIX_DIR/test/SelfGravity/JeansInstability
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/SelfGravity/JeansInstability -all $TESTME_OPTIONS
       - name: Random sphere spherical
-        run: |
-          cd $IDEFIX_DIR/test/SelfGravity/RandomSphere
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/SelfGravity/RandomSphere -all $TESTME_OPTIONS
       - name: Random sphere cartesian
-        run: |
-          cd $IDEFIX_DIR/test/SelfGravity/RandomSphereCartesian
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/SelfGravity/RandomSphereCartesian -all $TESTME_OPTIONS
       - name: Uniform spherical collapse
-        run: |
-          cd $IDEFIX_DIR/test/SelfGravity/UniformCollapse
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/SelfGravity/UniformCollapse -all $TESTME_OPTIONS
       - name: Dusty spherical collapse
-        run: |
-          cd $IDEFIX_DIR/test/SelfGravity/DustyCollapse
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/SelfGravity/DustyCollapse -all $TESTME_OPTIONS
 
   Planet:
     needs: [Linter, ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD]
@@ -200,29 +155,17 @@ jobs:
         with:
           submodules: recursive
       - name: 3 body
-        run: |
-          cd $IDEFIX_DIR/test/Planet/Planet3Body
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/Planet3Body -all $TESTME_OPTIONS
       - name: migration
-        run: |
-          cd $IDEFIX_DIR/test/Planet/PlanetMigration2D
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/PlanetMigration2D -all $TESTME_OPTIONS
       - name: planet-planet
-        run: |
-          cd $IDEFIX_DIR/test/Planet/PlanetPlanetRK42D
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/PlanetPlanetRK42D -all $TESTME_OPTIONS
       - name: spiral wake
-        run: |
-          cd $IDEFIX_DIR/test/Planet/PlanetSpiral2D
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/PlanetSpiral2D -all $TESTME_OPTIONS
       - name: torques
-        run: |
-          cd $IDEFIX_DIR/test/Planet/PlanetTorque3D
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/PlanetTorque3D -all $TESTME_OPTIONS
       - name: RK5
-        run: |
-          cd $IDEFIX_DIR/test/Planet/PlanetsIsActiveRK52D
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/PlanetsIsActiveRK52D -all $TESTME_OPTIONS
 
   Dust:
     needs: [Linter, ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD]
@@ -233,13 +176,9 @@ jobs:
         with:
           submodules: recursive
       - name: Energy conservation
-        run: |
-          cd $IDEFIX_DIR/test/Dust/DustEnergy
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/Dust/DustEnergy -all $TESTME_OPTIONS
       - name: Dusty wave
-        run: |
-          cd $IDEFIX_DIR/test/Dust/DustyWave
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/Dust/DustyWave -all $TESTME_OPTIONS
 
   Braginskii:
     needs: [Linter, ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD]
@@ -250,17 +189,11 @@ jobs:
         with:
           submodules: recursive
       - name: MTI
-        run: |
-          cd $IDEFIX_DIR/test/MHD/MTI
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/MTI -all $TESTME_OPTIONS
       - name: Spherical anisotropic diffusion
-        run: |
-          cd $IDEFIX_DIR/test/MHD/sphBragTDiffusion
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/sphBragTDiffusion -all $TESTME_OPTIONS
       - name: Spherical anisotropic viscosity
-        run: |
-          cd $IDEFIX_DIR/test/MHD/sphBragViscosity
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/sphBragViscosity -all $TESTME_OPTIONS
 
   Examples:
     needs: [Fargo, Dust, Planet, ShearingBox, SelfGravity]
@@ -282,10 +215,6 @@ jobs:
         with:
           submodules: recursive
       - name: Lookup table
-        run: |
-          cd $IDEFIX_DIR/test/utils/lookupTable
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/utils/lookupTable -all $TESTME_OPTIONS
       - name: Dump Image
-        run: |
-          cd $IDEFIX_DIR/test/utils/dumpImage
-          ./testme.py -all $TESTME_OPTIONS
+        run: scripts/ci/run-tests $IDEFIX_DIR/test/utils/dumpImage -all $TESTME_OPTIONS
diff --git a/.github/workflows/idefix-ci.yml b/.github/workflows/idefix-ci.yml
index c83635b8..6bf49643 100644
--- a/.github/workflows/idefix-ci.yml
+++ b/.github/workflows/idefix-ci.yml
@@ -15,9 +15,18 @@ jobs:
     uses: ./.github/workflows/idefix-ci-jobs.yml
     with:
       TESTME_OPTIONS: -cuda -Werror
+      IDEFIX_COMPILER: cuda
 
-  cpu-jobs:
-    name: CPU Jobs
+  gcc-jobs:
+    name: CPU Jobs (gcc)
     uses: ./.github/workflows/idefix-ci-jobs.yml
     with:
       TESTME_OPTIONS: -Werror
+      IDEFIX_COMPILER: gcc
+
+  icc-jobs:
+    name: CPU Jobs (icc)
+    uses: ./.github/workflows/idefix-ci-jobs.yml
+    with:
+      TESTME_OPTIONS: -Werror
+      IDEFIX_COMPILER: icc
diff --git a/scripts/ci/run-tests b/scripts/ci/run-tests
new file mode 100755
index 00000000..f4565d53
--- /dev/null
+++ b/scripts/ci/run-tests
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+set -ue
+if [ "$IDEFIX_COMPILER" == icc ]; then
+    source /opt/intel/oneapi/setvars.sh
+    export CC=icx
+    export CXX=icpx
+fi
+cd "$1"
+./testme.py "${@:2}"