diff --git a/.cirrus.yml b/.cirrus.yml
index d53b09f3..5c5e2127 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -96,33 +96,6 @@ bazel-tsan_task:
         -//c-toxcore/auto_tests:tcp_relay_test
         -//c-toxcore/auto_tests:tox_many_test
 
-# TODO(iphydf): Fix timeouts so we can run more of the tests disabled below.
-bazel-valgrind_task:
-  container:
-    image: toxchat/toktok-stack:latest-release
-    cpu: 2
-    memory: 4G
-  configure_script:
-    - git submodule update --init --recursive
-    - /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,-fuzz-test
-        --test_tag_filters=-haskell,-fuzz-test
-        --remote_download_minimal
-        --config=valgrind
-        --
-        //c-toxcore/...
-        -//c-toxcore/auto_tests:conference_av_test
-        -//c-toxcore/auto_tests:conference_test
-        -//c-toxcore/auto_tests:encryptsave_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_tcp_test
-        -//c-toxcore/auto_tests:tox_many_test
-
 cimple_task:
   container:
     image: toxchat/toktok-stack:latest-release
diff --git a/.github/settings.yml b/.github/settings.yml
index 8550b686..7f4f86a0 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -16,7 +16,6 @@ branches:
           - "bazel-dbg"
           - "bazel-opt"
           - "bazel-tsan"
-          - "bazel-valgrind"
           - "build-compcert"
           - "build-macos"
           - "build-nacl"