diff --git a/.cirrus.yml b/.cirrus.yml
index 184ed811..dc06570d 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -37,7 +37,7 @@ bazel-asan_task:
   container:
     image: toxchat/toktok-stack:0.0.31-asan
     cpu: 2
-    memory: 2G
+    memory: 4G
   configure_script:
     - /src/workspace/tools/inject-repo c-toxcore
   test_all_script:
@@ -50,11 +50,30 @@ bazel-asan_task:
         //c-toxcore/...
         -//c-toxcore/auto_tests:tcp_relay_test # TODO(robinlinden): Why does this pass locally but not in Cirrus?
 
+# TODO(iphydf): Get msan to work properly.
+#bazel-msan_task:
+#  container:
+#    image: toxchat/toktok-stack:0.0.31-msan
+#    cpu: 2
+#    memory: 4G
+#  configure_script:
+#    - /src/workspace/tools/inject-repo c-toxcore
+#  test_all_script:
+#    - cd /src/workspace && bazel test -k
+#        --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST
+#        --build_tag_filters=-haskell
+#        --test_tag_filters=-haskell
+#        --remote_download_minimal
+#        --
+#        //c-toxcore/...
+#        -//c-toxcore/auto_tests:tcp_relay_test # TODO(robinlinden): Why does this pass locally but not in Cirrus?
+
+# TODO(iphydf): Fix test timeouts.
 bazel-tsan_task:
   container:
     image: toxchat/toktok-stack:0.0.31-tsan
     cpu: 2
-    memory: 2G
+    memory: 4G
   configure_script:
     - /src/workspace/tools/inject-repo c-toxcore
   test_all_script:
@@ -65,7 +84,13 @@ bazel-tsan_task:
         --remote_download_minimal
         --
         //c-toxcore/...
-        -//c-toxcore/auto_tests:tcp_relay_test # TODO(robinlinden): Why does this pass locally but not in Cirrus?
+        -//c-toxcore/auto_tests:conference_av_test
+        -//c-toxcore/auto_tests:conference_test
+        -//c-toxcore/auto_tests:dht_test
+        -//c-toxcore/auto_tests:file_transfer_test
+        -//c-toxcore/auto_tests:onion_test
+        -//c-toxcore/auto_tests:tcp_relay_test
+        -//c-toxcore/auto_tests:tox_many_test
 
 cimple_task:
   container:
diff --git a/.github/settings.yml b/.github/settings.yml
index 830864f6..3d8023f7 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -12,8 +12,11 @@ branches:
     protection:
       required_status_checks:
         contexts:
+          # TODO(iphydf): Make asan required once errors are fixed.
+          #- "bazel-asan"
           - "bazel-debug"
           - "bazel-release"
+          - "bazel-tsan"
           - "build-bootstrapd-docker"
           - "build-compcert"
           - "build-macos"
@@ -22,6 +25,8 @@ branches:
           - "build-win32"
           - "build-win64"
           - "CodeFactor"
+          - "codecov/project"
+          - "coverage-linux"
           - "ci/circleci: asan"
           - "ci/circleci: clang-tidy"
           - "ci/circleci: infer"