diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 474068f..b365742 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -23,8 +23,16 @@ jobs:
         openmp: ['ON', 'OFF']
         cmake_build_type: ['Debug', 'Release']
         kokkos_ver: ['4.1.00']
+        arborx: ['ArborX']
         coverage: ['OFF']
         include:
+          - distro: 'ubuntu:latest'
+            cxx: 'g++'
+            openmp: 'ON'
+            cmake_build_type: 'Debug'
+            kokkos_ver: '4.1.00'
+            arborx: 'OFF'
+            coverage: 'OFF'
           - distro: 'ubuntu:latest'
             cxx: 'g++'
             openmp: 'ON'
@@ -57,12 +65,14 @@ jobs:
           cmake --build build --parallel 2
           cmake --install build
       - name: Checkout arborx
+        if: ${{ matrix.arborx != 'OFF' }}
         uses: actions/checkout@v3
         with:
           repository: arborx/ArborX
           ref: v1.2
           path: arborx
       - name: Build arborx
+        if: ${{ matrix.arborx != 'OFF' }}
         working-directory: arborx
         run: |
           cmake -B build \
diff --git a/unit_test/CMakeLists.txt b/unit_test/CMakeLists.txt
index 869a95b..ffbf170 100644
--- a/unit_test/CMakeLists.txt
+++ b/unit_test/CMakeLists.txt
@@ -147,7 +147,7 @@ Picasso_add_tests(NAMES
   APIC
   )
 
-Picasso_add_tests(MPI NAMES
+set(MPI_TESTS
   FacetGeometry
   ParticleInit
   ParticleList
@@ -160,6 +160,11 @@ Picasso_add_tests(MPI NAMES
   GridOperator2d
   ParticleInterpolation
   LevelSetRedistance
-  ParticleLevelSet
   MarchingCubes
   )
+
+if(Picasso_ENABLE_ARBORX)
+  list(APPEND MPI_TESTS ParticleLevelSet)
+endif()
+
+Picasso_add_tests(MPI NAMES ${MPI_TESTS})