diff --git a/.circleci/config.yml b/.circleci/config.yml
index 566f2110..034fed8b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,8 +17,9 @@ jobs:
     steps:
       - checkout
       - run: &apt_install
-          apt update &&
-          apt install -y --no-install-recommends
+          apt-get update &&
+          DEBIAN_FRONTEND=noninteractive
+          apt-get install -y --no-install-recommends
             clang
             cmake
             libconfig-dev
diff --git a/.cirrus.yml b/.cirrus.yml
index db5a0e56..ab863125 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,16 +1,15 @@
 ---
 cirrus-ci_task:
   container:
-    image: l.gcr.io/google/bazel:2.2.0
-    cpu: 8
-    memory: 12G
+    image: toxchat/toktok-stack:0.0.7
+    cpu: 2
+    memory: 2G
   configure_script:
-    - cd .. && mv cirrus-ci-build c-toxcore
-    - git clone --depth=1 https://github.com/TokTok/toktok-stack cirrus-ci-build
-    - mv c-toxcore cirrus-ci-build
-    - cd cirrus-ci-build
-    - tools/setup-ci
-    - bazel version
+    - /src/workspace/tools/inject-repo c-toxcore
   test_all_script:
-    - RUN_TEST="bazel test --copt=-DUSE_IPV6=0 -c opt -k //c-toxcore/..."
-    - $RUN_TEST || $RUN_TEST
+    - bazel test -k
+        --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST
+        --config=ci
+        --config=docker
+        --config=release
+        //c-toxcore/...
diff --git a/.travis/cmake-windows.sh b/.travis/cmake-windows.sh
index f22accc0..85d47e1b 100644
--- a/.travis/cmake-windows.sh
+++ b/.travis/cmake-windows.sh
@@ -31,7 +31,7 @@ travis_script() {
     -e ENABLE_ARCH_x86_64=$x86_64 \
     -e ENABLE_TEST=true \
     -e EXTRA_CMAKE_FLAGS="-DBOOTSTRAP_DAEMON=OFF -DMIN_LOGGER_LEVEL=DEBUG -DTEST_TIMEOUT_SECONDS=90 -DAUTOTEST=ON" \
-    -e DCMAKE_C_FLAGS="$C_FLAGS" \
+    -e CMAKE_C_FLAGS="$C_FLAGS" \
     -e CMAKE_CXX_FLAGS="$CXX_FLAGS" \
     -e CMAKE_EXE_LINKER_FLAGS="$LD_FLAGS" \
     -e CMAKE_SHARED_LINKER_FLAGS="$LD_FLAGS" \
diff --git a/codecov.yml b/codecov.yml
new file mode 100644
index 00000000..97da41be
--- /dev/null
+++ b/codecov.yml
@@ -0,0 +1,4 @@
+coverage:
+  precision: 2
+  round: down
+  range: "80...100"