diff --git a/ci/docker/aarch64-linux-android/Dockerfile b/ci/docker/aarch64-linux-android/Dockerfile
index 56685c54782310d9310ae47374245dfab0b10546..0aa99eeea10aeed95a4f3c54155aebed550c5522 100644
--- a/ci/docker/aarch64-linux-android/Dockerfile
+++ b/ci/docker/aarch64-linux-android/Dockerfile
@@ -30,6 +30,7 @@ RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linu
 ENV PATH=$PATH:/rust/bin \
     CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android28-clang \
     CARGO_TARGET_AARCH64_LINUX_ANDROID_RUNNER=/tmp/runtest \
+    CC_aarch64_linux_android=aarch64-linux-android28-clang \
     HOME=/tmp
 
 ADD runtest-android.rs /tmp/runtest.rs
diff --git a/ci/docker/arm-linux-androideabi/Dockerfile b/ci/docker/arm-linux-androideabi/Dockerfile
index cee5882d91acbea4ac3fbeffc5a476c92557cae7..e5cc79d87fd1bad3d02cc09b61b52fa8d995d5f1 100644
--- a/ci/docker/arm-linux-androideabi/Dockerfile
+++ b/ci/docker/arm-linux-androideabi/Dockerfile
@@ -30,6 +30,7 @@ RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linu
 ENV PATH=$PATH:/rust/bin \
     CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-gcc \
     CARGO_TARGET_ARM_LINUX_ANDROIDEABI_RUNNER=/tmp/runtest \
+    CC_arm_linux_androideabi=arm-linux-androideabi-gcc \
     HOME=/tmp
 
 ADD runtest-android.rs /tmp/runtest.rs
diff --git a/ci/docker/i686-linux-android/Dockerfile b/ci/docker/i686-linux-android/Dockerfile
index 050be4153436cc38864b9b2846d519589f89b7de..62a379b3cf8bc41eac74821fd79aa9b59c5329e6 100644
--- a/ci/docker/i686-linux-android/Dockerfile
+++ b/ci/docker/i686-linux-android/Dockerfile
@@ -30,6 +30,7 @@ RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linu
 ENV PATH=$PATH:/rust/bin \
     CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android-gcc \
     CARGO_TARGET_I686_LINUX_ANDROID_RUNNER=/tmp/runtest \
+    CC_i686_linux_android=i686-linux-android-gcc \
     HOME=/tmp
 
 ADD runtest-android.rs /tmp/runtest.rs
diff --git a/libc-test/Cargo.toml b/libc-test/Cargo.toml
index ae5bfe39330a73729c5dbb80059cf1dd8cfa0c1e..75ae60466dd1a8b92d96a1b34746b4f3cd3d82aa 100644
--- a/libc-test/Cargo.toml
+++ b/libc-test/Cargo.toml
@@ -9,7 +9,7 @@ path = ".."
 default-features = false
 
 [build-dependencies]
-cc = "=1.0.52"
+cc = "1.0.61"
 # FIXME: Use fork ctest until the maintainer gets back.
 ctest2 = "0.3"