diff --git a/.cirrus.yml b/.cirrus.yml
index 4a5353f..7dcd222 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -72,9 +72,9 @@ task:
     << : *ENV_MATRIX_SAN_VALGRIND
   matrix:
     - env:
-        CC: gcc
+        CXX: g++
     - env:
-        CC: clang
+        CXX: clang++ -gdwarf-4
   << : *MERGE_BASE
   test_script:
     - ./ci/cirrus.sh
@@ -92,9 +92,10 @@ task:
     << : *ENV_MATRIX_VALGRIND
   matrix:
     - env:
-        CC: i686-linux-gnu-gcc
+        CXX: i686-linux-gnu-g++
     - env:
-        CC: clang --target=i686-pc-linux-gnu -isystem /usr/i686-linux-gnu/include
+        CXX: clang++ --target=i686-linux-gnu -gdwarf-4
+        CXXFLAGS: -g -O2 -isystem /usr/i686-linux-gnu/include -isystem /usr/i686-linux-gnu/include/c++/10/i686-linux-gnu
   test_script:
     - ./ci/cirrus.sh
   << : *CAT_LOGS
@@ -110,9 +111,9 @@ task:
     << : *ENV_MATRIX_SAN
   matrix:
     - env:
-        CC: gcc-9
+        CXX: g++-9
     - env:
-        CC: clang
+        CXX: clang++
   brew_script:
     - brew update
     - brew install automake libtool gcc@9
diff --git a/ci/cirrus.sh b/ci/cirrus.sh
index 02f737c..812cf23 100755
--- a/ci/cirrus.sh
+++ b/ci/cirrus.sh
@@ -7,7 +7,7 @@ export LC_ALL=C
 
 env >> test_env.log
 
-$CC -v || true
+$CXX -v || true
 valgrind --version || true
 
 ./autogen.sh
diff --git a/ci/linux-debian.Dockerfile b/ci/linux-debian.Dockerfile
index 63e5412..e8c8358 100644
--- a/ci/linux-debian.Dockerfile
+++ b/ci/linux-debian.Dockerfile
@@ -8,10 +8,10 @@ RUN apt-get update
 RUN apt-get install --no-install-recommends --no-upgrade -y \
         git ca-certificates \
         make automake libtool pkg-config dpkg-dev valgrind qemu-user \
-        gcc g++ clang libc6-dbg \
+        gcc g++ clang libclang-rt-dev libc6-dbg \
         gcc-i686-linux-gnu g++-i686-linux-gnu libc6-dev-i386-cross libc6-dbg:i386 \
         g++-s390x-linux-gnu gcc-s390x-linux-gnu libc6-dev-s390x-cross libc6-dbg:s390x \
-        wine g++-mingw-w64-x86-64
+        wine wine32:i386 g++-mingw-w64-x86-64
 
 # Run a dummy command in wine to make it set up configuration
 RUN wine true || true
diff --git a/configure.ac b/configure.ac
index 8391044..42a28f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,7 +119,6 @@ if test "x$use_ccache" != "xno"; then
     fi
   else
     use_ccache=yes
-    CC="$ac_cv_path_CCACHE $CC"
     CXX="$ac_cv_path_CCACHE $CXX"
   fi
   AC_MSG_RESULT($use_ccache)