diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index bb747728f84..337974119b0 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -18,10 +18,9 @@ jobs:
     FFTW_HOME: '/usr'
     LAPACKPP_HOME: '/usr/local'
     WARPX_CI_CCACHE: 'TRUE'
-    #WARPX_CI_OPENPMD: 'TRUE'
+    #WARPX_OPENPMD: 'TRUE'
 
   strategy:
-    # FIXME uncomment all variants
     matrix:
       # Cartesian 1D
       cartesian_1d:
@@ -32,6 +31,7 @@ jobs:
       # Cartesian 3D
       cartesian_3d:
         WARPX_CMAKE_FLAGS: -DWarpX_DIMS=3 -DWarpX_FFT=ON -DWarpX_PYTHON=ON
+        WARPX_HEFFTE: 'TRUE'
       # Cylindrical RZ
       cylindrical_rz:
         WARPX_CMAKE_FLAGS: -DWarpX_DIMS=RZ -DWarpX_FFT=ON -DWarpX_PYTHON=ON
@@ -40,6 +40,7 @@ jobs:
       embedded_boundaries:
         WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_PYTHON=ON -DWarpX_EB=ON
         WARPX_RZ_FFT: 'TRUE'
+      # single precision
       #single_precision:
       #  WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_PYTHON=ON -DWarpX_PRECISION=SINGLE
       #  WARPX_RZ_FFT: 'TRUE'
@@ -95,7 +96,7 @@ jobs:
       export PATH="$HOME/.local/bin:$PATH"
       sudo curl -L -o /usr/local/bin/cmake-easyinstall https://raw.githubusercontent.com/ax3l/cmake-easyinstall/main/cmake-easyinstall
       sudo chmod a+x /usr/local/bin/cmake-easyinstall
-      #if [ "${WARPX_CI_OPENPMD:-FALSE}" == "TRUE" ]; then
+      #if [ "${WARPX_OPENPMD:-FALSE}" == "TRUE" ]; then
       #  cmake-easyinstall --prefix=/usr/local                   \
       #    git+https://github.com/openPMD/openPMD-api.git@0.14.3 \
       #    -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache)         \
@@ -117,24 +118,24 @@ jobs:
           -DCMAKE_CXX_STANDARD=17                         \
           -Duse_cmake_find_lapack=ON -Dbuild_tests=OFF -DCMAKE_VERBOSE_MAKEFILE=ON
       fi
-      #if [[ "${WARPX_CI_REGULAR_CARTESIAN_3D:-FALSE}" == "TRUE" ]]; then
-      #  cmake-easyinstall --prefix=/usr/local git+https://github.com/icl-utk-edu/heffte.git@v2.4.0 \
-      #    -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache)          \
-      #    -DCMAKE_CXX_STANDARD=17 -DHeffte_ENABLE_DOXYGEN=OFF    \
-      #    -DHeffte_ENABLE_FFTW=ON -DHeffte_ENABLE_TESTING=OFF    \
-      #    -DHeffte_ENABLE_CUDA=OFF -DHeffte_ENABLE_ROCM=OFF      \
-      #    -DHeffte_ENABLE_ONEAPI=OFF -DHeffte_ENABLE_MKL=OFF     \
-      #    -DHeffte_ENABLE_PYTHON=OFF -DHeffte_ENABLE_FORTRAN=OFF \
-      #    -DHeffte_ENABLE_MAGMA=OFF                              \
-      #    -DCMAKE_VERBOSE_MAKEFILE=ON
-      #fi
+      if [ "${WARPX_HEFFTE:-FALSE}" == "TRUE" ]; then
+        cmake-easyinstall --prefix=/usr/local git+https://github.com/icl-utk-edu/heffte.git@v2.4.0 \
+          -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache)          \
+          -DCMAKE_CXX_STANDARD=17 -DHeffte_ENABLE_DOXYGEN=OFF    \
+          -DHeffte_ENABLE_FFTW=ON -DHeffte_ENABLE_TESTING=OFF    \
+          -DHeffte_ENABLE_CUDA=OFF -DHeffte_ENABLE_ROCM=OFF      \
+          -DHeffte_ENABLE_ONEAPI=OFF -DHeffte_ENABLE_MKL=OFF     \
+          -DHeffte_ENABLE_PYTHON=OFF -DHeffte_ENABLE_FORTRAN=OFF \
+          -DHeffte_ENABLE_MAGMA=OFF                              \
+          -DCMAKE_VERBOSE_MAKEFILE=ON
+      fi
       # Python modules required for test analysis
       python3 -m pip install --upgrade -r Regression/requirements.txt
       python3 -m pip cache purge
       # external repositories required for test analysis
       cd ..
       git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git
-      # FIXME do we want to select only specific datasets?
+      # TODO select only specific datasets?
       git clone --depth 1 https://github.com/openPMD/openPMD-example-datasets.git
       cd -
       rm -rf ${CEI_TMP}