diff --git a/.cirrus.yml b/.cirrus.yml
new file mode 100644
index 0000000000..7d84a7702d
--- /dev/null
+++ b/.cirrus.yml
@@ -0,0 +1,126 @@
+cpus: &CPUS 8
+btest_jobs: &BTEST_JOBS 8
+memory: &MEMORY 8GB
+
+config: &CONFIG --build-type=release --enable-cpp-tests
+leak_config: &LEAK_CONFIG --build-type=debug --enable-perftools-debug
+
+resources_template: &RESOURCES_TEMPLATE
+  cpu: *CPUS
+  memory: *MEMORY
+
+ci_template: &CI_TEMPLATE
+  only_if: >
+    $CIRRUS_PR != '' ||
+    $CIRRUS_BRANCH == 'master' ||
+    $CIRRUS_BRANCH =~ 'release/.*'
+
+  # Default timeout is 60 minutes, Cirrus hard limit is 120 minutes for free
+  # tasks.  This leakcheck one can tend to run long, but see no downside
+  # to universally asking for the maximum.
+  timeout_in: 120m
+
+  sync_submodules_script: git submodule update --recursive --init
+
+  get_external_pcaps_cache:
+    folder: testing/external/zeek-testing-traces
+    fingerprint_script: echo zeek-testing-traces
+    populate_script: ./ci/init-external-repos.sh
+  init_external_repos_script: ./ci/init-external-repos.sh
+
+  build_script: ./ci/build.sh
+  test_script: ./ci/test.sh
+
+  on_failure:
+    upload_btest_tmp_dir_artifacts:
+      path: "testing/**/tmp.tar.gz"
+  always:
+    upload_btest_xml_results_artifacts:
+      path: "testing/**/btest-results.xml"
+      type: text/xml
+      format: junit
+    upload_btest_html_results_artifacts:
+      path: "testing/**/btest-results.html"
+      type: text/html
+
+env:
+  CIRRUS_WORKING_DIR: /zeek
+  ZEEK_CI_CPUS: *CPUS
+  ZEEK_CI_BTEST_JOBS: *BTEST_JOBS
+  ZEEK_CI_CONFIGURE_FLAGS: *CONFIG
+  # This is a single-use, read-only GitHub deploy key (SSH private key) for the
+  # zeek-testing-private repository.
+  ZEEK_TESTING_PRIVATE_SSH_KEY: ENCRYPTED[4d924499a9b7428fc5c2faf72c86315c9dd8685561f597a009b935ca8dc102af8fc7e397eacc91bc224315d79cc09158]
+
+# Linux EOL timelines: https://linuxlifecycle.com/
+# Fedora (~13 months): https://fedoraproject.org/wiki/Fedora_Release_Life_Cycle
+
+fedora30_task:
+  container:
+    # Fedora 30 EOL: Around June 2020
+    dockerfile: ci/fedora-30/Dockerfile
+    << : *RESOURCES_TEMPLATE
+  << : *CI_TEMPLATE
+
+centos7_task:
+  container:
+    # CentOS 7 EOL: June 30, 2024
+    dockerfile: ci/centos-7/Dockerfile
+    << : *RESOURCES_TEMPLATE
+  << : *CI_TEMPLATE
+
+debian9_task:
+  container:
+    # Debian 9 EOL: June 2022
+    dockerfile: ci/debian-9/Dockerfile
+    << : *RESOURCES_TEMPLATE
+  << : *CI_TEMPLATE
+
+ubuntu18_task:
+  container:
+    # Ubuntu 18.04 EOL: April 2023
+    dockerfile: ci/ubuntu-18.04/Dockerfile
+    << : *RESOURCES_TEMPLATE
+  << : *CI_TEMPLATE
+
+ubuntu16_task:
+  container:
+    # Ubuntu 16.04 EOL: April 2021
+    dockerfile: ci/ubuntu-16.04/Dockerfile
+    << : *RESOURCES_TEMPLATE
+  << : *CI_TEMPLATE
+
+# Apple doesn't publish official long-term support timelines, so easiest
+# option is to only support the latest macOS release or whatever latest
+# image is available.
+macos_task:
+  osx_instance:
+    image: mojave-base
+  prepare_script: ./ci/macos/prepare.sh
+  << : *CI_TEMPLATE
+  env:
+    # Currently only available as 2 core / 4 thread (and 8GB) instances.
+    ZEEK_CI_CPUS: 4
+    ZEEK_CI_BTEST_JOBS: 4
+    # No permission to write to default location of /zeek
+    CIRRUS_WORKING_DIR: /tmp/zeek
+
+# FreeBSD EOL timelines: https://www.freebsd.org/security/security.html#sup
+freebsd_task:
+  freebsd_instance:
+    # FreeBSD 12 EOL: June 30, 2024
+    image_family: freebsd-12-1
+    << : *RESOURCES_TEMPLATE
+  prepare_script: ./ci/freebsd/prepare.sh
+  << : *CI_TEMPLATE
+
+leakcheck_task:
+  container:
+    # Just uses a recent/common distro to run leak checks.
+    dockerfile: ci/ubuntu-18.04/Dockerfile
+    << : *RESOURCES_TEMPLATE
+  << : *CI_TEMPLATE
+  env:
+    ZEEK_CI_LEAK_CHECK: true
+    ZEEK_CI_CONFIGURE_FLAGS: *LEAK_CONFIG
+    ZEEK_CI_BTEST_JOBS: 7
diff --git a/.travis.yml b/.travis.yml
index 12b21ed5cb..6f5791cef4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,8 +31,8 @@ env:
   - distro: ubuntu_18.04
   - distro: ubuntu_18.04_leaktest
 
-install: sh testing/scripts/travis-job install $distro
+install: sh ci/travis-job install $distro
 
-before_script: sh testing/scripts/travis-job build $distro
+before_script: sh ci/travis-job build $distro
 
-script: sh testing/scripts/travis-job run $distro
+script: sh ci/travis-job run $distro
diff --git a/ci/build.sh b/ci/build.sh
new file mode 100755
index 0000000000..df0aa66933
--- /dev/null
+++ b/ci/build.sh
@@ -0,0 +1,7 @@
+#! /usr/bin/env bash
+
+set -e
+set -x
+
+./configure ${ZEEK_CI_CONFIGURE_FLAGS}
+make -j ${ZEEK_CI_CPUS}
diff --git a/ci/centos-7/Dockerfile b/ci/centos-7/Dockerfile
new file mode 100644
index 0000000000..759d08d19a
--- /dev/null
+++ b/ci/centos-7/Dockerfile
@@ -0,0 +1,54 @@
+FROM centos:7
+
+# The version of git in the standard repos is 1.8 and CI needs 2.3+
+# for the use of GIT_SSH_COMMAND when cloning private repos.
+RUN yum -y install \
+    https://repo.ius.io/ius-release-el7.rpm \
+    https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
+  && yum -y install git2u \
+  && yum clean all && rm -rf /var/cache/yum
+
+RUN yum -y install \
+    epel-release \
+  && yum clean all && rm -rf /var/cache/yum
+
+RUN yum -y install \
+    centos-release-scl \
+  && yum clean all && rm -rf /var/cache/yum
+
+RUN yum -y install \
+    devtoolset-7 \
+  && yum clean all && rm -rf /var/cache/yum
+
+RUN yum -y install \
+    cmake3 \
+    make \
+    flex \
+    bison \
+    swig \
+    openssl \
+    openssl-devel \
+    libpcap-devel \
+    python3 \
+    python3-devel \
+    python3-pip\
+    zlib-devel \
+    sqlite \
+    findutils \
+    which \
+  && yum clean all && rm -rf /var/cache/yum
+
+# Many distros adhere to PEP 394's recommendation for `python` = `python2` so
+# this is a simple workaround until we drop Python 2 support and explicitly
+# use `python3` for all invocations (e.g. in shebangs).
+RUN ln -sf /usr/bin/python3 /usr/local/bin/python
+RUN ln -sf /usr/bin/pip3 /usr/local/bin/pip
+
+RUN pip install junit2html
+
+RUN echo 'unset BASH_ENV PROMPT_COMMAND ENV' > /usr/bin/zeek-ci-env && \
+    echo 'source /opt/rh/devtoolset-7/enable' >> /usr/bin/zeek-ci-env
+
+ENV BASH_ENV="/usr/bin/zeek-ci-env" \
+    ENV="/usr/bin/zeek-ci-env" \
+    PROMPT_COMMAND=". /usr/bin/zeek-ci-env"
diff --git a/ci/debian-9/Dockerfile b/ci/debian-9/Dockerfile
new file mode 100644
index 0000000000..6f961aa9ac
--- /dev/null
+++ b/ci/debian-9/Dockerfile
@@ -0,0 +1,40 @@
+FROM debian:9
+
+RUN apt-get update && apt-get -y install \
+    git \
+    cmake \
+    make \
+    gcc \
+    g++ \
+    flex \
+    bison \
+    libpcap-dev \
+    libssl-dev \
+    python3 \
+    python3-dev \
+    python3-pip\
+    swig \
+    zlib1g-dev \
+    libkrb5-dev \
+    bsdmainutils \
+    sqlite3 \
+    curl \
+    wget \
+    xz-utils \
+    clang-7 \
+    libc++-7-dev \
+    libc++abi-7-dev \
+  && rm -rf /var/lib/apt/lists/*
+
+RUN update-alternatives --install /usr/bin/cc cc /usr/bin/clang-7 100
+RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-7 100
+
+# Many distros adhere to PEP 394's recommendation for `python` = `python2` so
+# this is a simple workaround until we drop Python 2 support and explicitly
+# use `python3` for all invocations (e.g. in shebangs).
+RUN ln -sf /usr/bin/python3 /usr/local/bin/python
+RUN ln -sf /usr/bin/pip3 /usr/local/bin/pip
+
+RUN pip install junit2html
+
+ENV CXXFLAGS=-stdlib=libc++
diff --git a/ci/fedora-30/Dockerfile b/ci/fedora-30/Dockerfile
new file mode 100644
index 0000000000..5572af01e3
--- /dev/null
+++ b/ci/fedora-30/Dockerfile
@@ -0,0 +1,30 @@
+FROM fedora:30
+
+RUN yum -y install \
+    git \
+    cmake \
+    make \
+    gcc \
+    gcc-c++ \
+    flex \
+    bison \
+    swig \
+    openssl \
+    openssl-devel \
+    libpcap-devel \
+    python3 \
+    python3-devel \
+    python3-pip\
+    zlib-devel \
+    sqlite \
+    findutils \
+    which \
+  && yum clean all && rm -rf /var/cache/yum
+
+# Many distros adhere to PEP 394's recommendation for `python` = `python2` so
+# this is a simple workaround until we drop Python 2 support and explicitly
+# use `python3` for all invocations (e.g. in shebangs).
+RUN ln -sf /usr/bin/python3 /usr/local/bin/python
+RUN ln -sf /usr/bin/pip3 /usr/local/bin/pip
+
+RUN pip install junit2html
diff --git a/ci/freebsd/prepare.sh b/ci/freebsd/prepare.sh
new file mode 100755
index 0000000000..5ff6f59833
--- /dev/null
+++ b/ci/freebsd/prepare.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+echo "Preparing FreeBSD environment"
+sysctl hw.model hw.machine hw.ncpu
+set -e
+set -x
+
+env ASSUME_ALWAYS_YES=YES pkg bootstrap
+pkg install -y bash git cmake swig30 bison python3 py36-sqlite3 py36-pip base64
+( cd && mkdir -p ./bin && ln -s /usr/local/bin/python3 ./bin/python )
+pip install junit2html
diff --git a/ci/init-external-repos.sh b/ci/init-external-repos.sh
new file mode 100755
index 0000000000..b7d7716ffd
--- /dev/null
+++ b/ci/init-external-repos.sh
@@ -0,0 +1,66 @@
+#! /usr/bin/env bash
+
+function banner
+    {
+    local msg="${1}"
+    printf "+--------------------------------------------------------------+\n"
+    printf "| %-60s |\n" "$(date)"
+    printf "| %-60s |\n" "${msg}"
+    printf "+--------------------------------------------------------------+\n"
+    }
+
+set -e
+
+cd testing/external
+[[ ! -d zeek-testing ]] && make init
+cd zeek-testing
+git checkout -q $(cat ../commit-hash.zeek-testing)
+
+if [[ -n "${CIRRUS_CI}" ]]; then
+    if [[ -d ../zeek-testing-traces ]]; then
+        banner "Use existing/cached zeek-testing traces"
+    else
+        banner "Create cache directory for zeek-testing traces"
+        mkdir ../zeek-testing-traces
+    fi
+
+    rm -rf Traces
+    ln -s ../zeek-testing-traces Traces
+fi
+
+make update-traces
+cd ..
+
+# Note that this script is also called when populating the public cache, so
+# the zeek-testing-private dir could have been created/populated already.
+if [[ -n "${CIRRUS_CI}" ]] && [[ ! -d zeek-testing-private ]]; then
+    # If we're running this on Cirrus, the SSH key won't be available to PRs,
+    # so don't make any of this fail the task in that case.  (But technically,
+    # the key is also available in PRs for people with write access to the
+    # repo, so we can still try for those cases).
+    if [[ -n "${CIRRUS_PR}" ]]; then
+        set +e
+    else
+        set -e
+    fi
+
+    banner "Trying to clone zeek-testing-private git repo"
+    echo "${ZEEK_TESTING_PRIVATE_SSH_KEY}" > cirrus_key.b64
+    base64 --decode cirrus_key.b64 > cirrus_key
+    rm cirrus_key.b64
+    chmod 600 cirrus_key
+    git --version
+    # Note: GIT_SSH_COMMAND requires git 2.3.0+
+    export GIT_SSH_COMMAND="ssh -i cirrus_key -F /dev/null -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
+    git clone git@github.com:zeek/zeek-testing-private
+    rm cirrus_key
+fi
+
+set -e
+
+if [[ -d zeek-testing-private ]]; then
+    # Note that we never cache private pcaps.
+    banner "Update zeek-testing-private traces"
+    cd zeek-testing-private
+    make update-traces
+fi
diff --git a/ci/macos/prepare.sh b/ci/macos/prepare.sh
new file mode 100755
index 0000000000..e12bab11a5
--- /dev/null
+++ b/ci/macos/prepare.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo "Preparing macOS environment"
+sysctl hw.model hw.machine hw.ncpu hw.physicalcpu hw.logicalcpu
+set -e
+set -x
+
+brew install cmake swig openssl bison
diff --git a/ci/test.sh b/ci/test.sh
new file mode 100755
index 0000000000..d7c1e71ab7
--- /dev/null
+++ b/ci/test.sh
@@ -0,0 +1,158 @@
+#! /usr/bin/env bash
+
+# It's possible to use this script locally from the zeek repo's root dir.
+# The parallelism level when running tests locally is $1 if provided, else
+# the value of `nproc` if available, otherwise just a single core.  Run with
+# ZEEK_CI_LEAK_CHECK set to do just the leak checks.
+
+result=0
+BTEST=$(pwd)/aux/btest/btest
+
+if [[ -z "${CIRRUS_CI}" ]]; then
+    # Set default values to use in place of env. variables set by Cirrus CI.
+    ZEEK_CI_CPUS=1
+    [[ $(which nproc) ]] && ZEEK_CI_CPUS=$(nproc)
+    [[ -n "${1}" ]] && ZEEK_CI_CPUS=${1}
+    ZEEK_CI_BTEST_JOBS=${ZEEK_CI_CPUS}
+fi
+
+function pushd
+    {
+    command pushd "$@" > /dev/null || exit 1
+    }
+
+function popd
+    {
+    command popd "$@" > /dev/null || exit 1
+    }
+
+function banner
+    {
+    local msg="${1}"
+    printf "+--------------------------------------------------------------+\n"
+    printf "| %-60s |\n" "$(date)"
+    printf "| %-60s |\n" "${msg}"
+    printf "+--------------------------------------------------------------+\n"
+    }
+
+function run_unit_tests
+    {
+    banner "Running unit tests"
+
+    pushd build
+    ( . ./zeek-path-dev.sh && zeek --test ) || result=1
+    popd
+    return 0
+    }
+
+function prep_artifacts
+    {
+    banner "Prepare artifacts"
+    [[ -d .tmp ]] && rm -rf .tmp/script-coverage && tar -czf tmp.tar.gz .tmp
+    junit2html btest-results.xml btest-results.html
+    }
+
+function run_btests
+    {
+    banner "Running baseline tests: zeek"
+
+    pushd testing/btest
+    ${BTEST} -d -b -x btest-results.xml -j ${ZEEK_CI_BTEST_JOBS} || result=1
+    make coverage
+    prep_artifacts
+    popd
+    return 0
+    }
+
+function run_external_btests
+    {
+    local zeek_testing_pid=""
+    local zeek_testing_pid_private=""
+    pushd testing/external/zeek-testing
+    ${BTEST} -d -b -x btest-results.xml -j ${ZEEK_CI_BTEST_JOBS} >btest.out 2>&1 &
+    zeek_testing_pid=$!
+    popd
+
+    if [[ -d testing/external/zeek-testing-private ]]; then
+        pushd testing/external/zeek-testing-private
+        # Note that we don't use btest's "-d" flag or generate/upload any
+        # artifacts to prevent leaking information about the private pcaps.
+        ${BTEST} -b -j ${ZEEK_CI_BTEST_JOBS} >btest.out 2>&1 &
+        zeek_testing_private_pid=$!
+        popd
+    fi
+
+    banner "Running baseline tests: external/zeek-testing"
+    wait ${zeek_testing_pid} || result=1
+    pushd testing/external/zeek-testing
+    cat btest.out
+    make coverage
+    prep_artifacts
+    popd
+
+    if [[ -n "${zeek_testing_private_pid}" ]]; then
+        banner "Running baseline tests: external/zeek-testing-private"
+        wait ${zeek_testing_private_pid} || result=1
+        pushd testing/external/zeek-testing-private
+        make coverage
+        cat btest.out
+        popd
+    else
+        banner "Skipping private tests (not available for PRs)"
+    fi
+    }
+
+function run_leak_tests
+    {
+    local zeek_testing_pid=""
+    local zeek_testing_pid_private=""
+    banner "Running memory leak tests: zeek"
+
+    pushd testing/btest
+    ${BTEST} -d -b -x btest-results.xml -j ${ZEEK_CI_BTEST_JOBS} -g leaks || result=1
+    prep_artifacts
+    popd
+
+    pushd testing/external/zeek-testing
+    ${BTEST} -d -b -x btest-results.xml -j ${ZEEK_CI_BTEST_JOBS} -g leaks >btest.out 2>&1 &
+    zeek_testing_pid=$!
+    popd
+
+    if [[ -d testing/external/zeek-testing-private ]]; then
+        pushd testing/external/zeek-testing-private
+        # Note that we don't use btest's "-d" flag or generate/upload any
+        # artifacts to prevent leaking information about the private pcaps.
+        ${BTEST} -b -j ${ZEEK_CI_BTEST_JOBS} -g leaks >btest.out 2>&1 &
+        zeek_testing_private_pid=$!
+        popd
+    fi
+
+    banner "Running memory leak tests: external/zeek-testing"
+    wait ${zeek_testing_pid} || result=1
+    pushd testing/external/zeek-testing
+    cat btest.out
+    prep_artifacts
+    popd
+
+    if [[ -n "${zeek_testing_private_pid}" ]]; then
+        banner "Running memory leak tests: external/zeek-testing-private"
+        wait ${zeek_testing_private_pid} || result=1
+        cat testing/external/zeek-testing-private/btest.out
+    else
+        banner "Skipping private tests (not available for PRs)"
+    fi
+
+    return 0
+    }
+
+banner "Start tests: ${ZEEK_CI_CPUS} cpus, ${ZEEK_CI_BTEST_JOBS} btest jobs"
+
+if [[ -n "${ZEEK_CI_LEAK_CHECK}" ]]; then
+    run_leak_tests
+else
+    run_unit_tests
+    run_btests
+    run_external_btests
+fi
+
+exit ${result}
diff --git a/testing/scripts/travis-job b/ci/travis-job
old mode 100644
new mode 100755
similarity index 98%
rename from testing/scripts/travis-job
rename to ci/travis-job
index bd759ba474..66df4eda4b
--- a/testing/scripts/travis-job
+++ b/ci/travis-job
@@ -125,7 +125,7 @@ build_in_docker() {
 
     # Pass the distro as a different environment variable name to docker since
     # the script will set $distro to "travis" as part of the invocation.
-    docker exec -e COV_TOKEN -e BUILD_DISTRO=${distro} zeektest sh testing/scripts/travis-job build ${recursed_distro}
+    docker exec -e COV_TOKEN -e BUILD_DISTRO=${distro} zeektest sh ci/travis-job build ${recursed_distro}
 }
 
 
@@ -139,7 +139,7 @@ run_in_docker() {
 
     # Pass the distro as a different environment variable name to docker since
     # the script will set $distro to "travis" as part of the invocation.
-    docker exec -t -e TRAVIS -e TRAVIS_PULL_REQUEST -e TESTING_PRIVATE_DEPLOYKEY -e COV_TOKEN -e BUILD_DISTRO=${distro} zeektest sh testing/scripts/travis-job run ${recursed_distro}
+    docker exec -t -e TRAVIS -e TRAVIS_PULL_REQUEST -e TESTING_PRIVATE_DEPLOYKEY -e COV_TOKEN -e BUILD_DISTRO=${distro} zeektest sh ci/travis-job run ${recursed_distro}
 }
 
 update_env() {
@@ -352,7 +352,7 @@ remove_container() {
 }
 
 
-if [ ! -f testing/scripts/travis-job ]; then
+if [ ! -f ci/travis-job ]; then
     echo "Error: must change directory to root of zeek source tree before running this script."
     exit 1
 fi
diff --git a/ci/ubuntu-16.04/Dockerfile b/ci/ubuntu-16.04/Dockerfile
new file mode 100644
index 0000000000..e591e1b949
--- /dev/null
+++ b/ci/ubuntu-16.04/Dockerfile
@@ -0,0 +1,41 @@
+FROM ubuntu:16.04
+
+RUN apt-get update && apt-get -y install \
+    git \
+    cmake \
+    make \
+    gcc \
+    g++ \
+    flex \
+    bison \
+    libpcap-dev \
+    libssl-dev \
+    python3 \
+    python3-dev \
+    python3-pip\
+    swig \
+    zlib1g-dev \
+    libkrb5-dev \
+    bsdmainutils \
+    sqlite3 \
+    curl \
+    wget \
+    xz-utils \
+  && rm -rf /var/lib/apt/lists/*
+
+RUN wget -q https://releases.llvm.org/9.0.0/clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz
+RUN mkdir /clang-9
+RUN tar --strip-components=1 -C /clang-9 -xvf clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz
+RUN update-alternatives --install /usr/bin/cc cc /clang-9/bin/clang 100
+RUN update-alternatives --install /usr/bin/c++ c++ /clang-9/bin/clang++ 100
+
+# Many distros adhere to PEP 394's recommendation for `python` = `python2` so
+# this is a simple workaround until we drop Python 2 support and explicitly
+# use `python3` for all invocations (e.g. in shebangs).
+RUN ln -sf /usr/bin/python3 /usr/local/bin/python
+RUN ln -sf /usr/bin/pip3 /usr/local/bin/pip
+
+RUN pip install junit2html
+
+ENV CXXFLAGS=-stdlib=libc++
+ENV LD_LIBRARY_PATH=/clang-9/lib
diff --git a/ci/ubuntu-18.04/Dockerfile b/ci/ubuntu-18.04/Dockerfile
new file mode 100644
index 0000000000..67b711814e
--- /dev/null
+++ b/ci/ubuntu-18.04/Dockerfile
@@ -0,0 +1,34 @@
+FROM ubuntu:18.04
+
+RUN apt-get update && apt-get -y install \
+    git \
+    cmake \
+    make \
+    gcc \
+    g++ \
+    flex \
+    bison \
+    libpcap-dev \
+    libssl-dev \
+    python3 \
+    python3-dev \
+    python3-pip\
+    swig \
+    zlib1g-dev \
+    libkrb5-dev \
+    bsdmainutils \
+    sqlite3 \
+    curl \
+    wget \
+    google-perftools \
+    libgoogle-perftools4 \
+    libgoogle-perftools-dev \
+  && rm -rf /var/lib/apt/lists/*
+
+# Many distros adhere to PEP 394's recommendation for `python` = `python2` so
+# this is a simple workaround until we drop Python 2 support and explicitly
+# use `python3` for all invocations (e.g. in shebangs).
+RUN ln -sf /usr/bin/python3 /usr/local/bin/python
+RUN ln -sf /usr/bin/pip3 /usr/local/bin/pip
+
+RUN pip install junit2html
diff --git a/testing/btest/broker/disconnect.zeek b/testing/btest/broker/disconnect.zeek
index 500a737ee2..10b3908b0d 100644
--- a/testing/btest/broker/disconnect.zeek
+++ b/testing/btest/broker/disconnect.zeek
@@ -3,7 +3,7 @@
 # @TEST-EXEC: btest-bg-run recv "zeek -B broker -b ../recv.zeek >recv.out"
 # @TEST-EXEC: btest-bg-run send "zeek -B broker -b ../send.zeek >send.out"
 
-# @TEST-EXEC: $SCRIPTS/wait-for-pid $(cat recv/.pid) 45 || (btest-bg-wait -k 1 && false)
+# @TEST-EXEC: $SCRIPTS/wait-for-file send/lost 45 || (btest-bg-wait -k 1 && false)
 
 # @TEST-EXEC: btest-bg-run recv2 "zeek -B broker -b ../recv.zeek >recv2.out"
 # @TEST-EXEC: btest-bg-wait 45
@@ -33,6 +33,7 @@ event zeek_init()
 event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string)
 	{
 	print "peer lost", msg;
+	system("touch lost");
 
 	if ( peers == 2 )
 		terminate();
diff --git a/testing/btest/broker/remote_log_types.zeek b/testing/btest/broker/remote_log_types.zeek
index 2417c75a41..4ea384e5f6 100644
--- a/testing/btest/broker/remote_log_types.zeek
+++ b/testing/btest/broker/remote_log_types.zeek
@@ -17,13 +17,11 @@
 redef exit_only_after_terminate = T;
 
 global quit_receiver: event();
-global quit_sender: event();
-
 
 module Test;
 
 export {
-        redef enum Log::ID += { LOG };
+	redef enum Log::ID += { LOG };
 
 	type Info: record {
 		b: bool;
@@ -48,9 +46,14 @@ export {
 }
 
 event zeek_init() &priority=5
-        {
-        Log::create_stream(Test::LOG, [$columns=Test::Info]);
-        }
+	{
+	Log::create_stream(Test::LOG, [$columns=Test::Info]);
+	}
+
+event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string)
+	{
+	terminate();
+	}
 
 @TEST-END-FILE
 
@@ -73,8 +76,6 @@ event quit_receiver()
 
 @TEST-START-FILE send.zeek
 
-
-
 @load ./common
 
 event zeek_init()
@@ -82,11 +83,6 @@ event zeek_init()
 	Broker::peer("127.0.0.1", to_port(getenv("BROKER_PORT")));
 	}
 
-event quit_sender()
-	{
-	terminate();
-	}
-
 function foo(i : count) : string
 	{
 	if ( i > 0 )
@@ -101,7 +97,7 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string)
 
 	local empty_set: set[string];
 	local empty_vector: vector of string;
-	
+
 	Log::write(Test::LOG, [
 		$b=T,
 		$i=-42,
@@ -122,10 +118,7 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string)
 		$f=foo
 		]);
 
-	local e = Broker::make_event(quit_receiver);
-	Broker::publish("zeek/", e);
-	schedule 1sec { quit_sender() };
-        }
-
+	Broker::publish("zeek/", quit_receiver);
+	}
 
 @TEST-END-FILE
diff --git a/testing/btest/broker/store/sqlite.zeek b/testing/btest/broker/store/sqlite.zeek
index 613f348550..b9b1225fce 100644
--- a/testing/btest/broker/store/sqlite.zeek
+++ b/testing/btest/broker/store/sqlite.zeek
@@ -6,7 +6,7 @@ global RUN = 0 &redef;
 
 redef exit_only_after_terminate = T;
 
-global query_timeout = 1sec;
+global query_timeout = 10sec;
 
 global h: opaque of Broker::Store;
 
@@ -32,8 +32,8 @@ event zeek_init()
 	h = Broker::create_master("master", Broker::SQLITE);
 
 	print "Run", RUN;
-	
-	if ( RUN == 1 ) 
+
+	if ( RUN == 1 )
 		{
 		print "Inserting";
 		Broker::put(h, "one", "110");
@@ -55,5 +55,5 @@ event zeek_init()
 		print_index(set("x", "y"));
 		}
 
-        schedule 2secs { done() };
+	schedule 2secs { done() };
 	}
diff --git a/testing/btest/core/leaks/ayiya.test b/testing/btest/core/leaks/ayiya.test
index abbf46e6d8..6aa1d5be24 100644
--- a/testing/btest/core/leaks/ayiya.test
+++ b/testing/btest/core/leaks/ayiya.test
@@ -5,4 +5,4 @@
 # @TEST-GROUP: leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -r $TRACES/tunnels/ayiya3.trace
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
diff --git a/testing/btest/core/leaks/basic-cluster.zeek b/testing/btest/core/leaks/basic-cluster.zeek
index e77a0ec417..eb1ce6c23e 100644
--- a/testing/btest/core/leaks/basic-cluster.zeek
+++ b/testing/btest/core/leaks/basic-cluster.zeek
@@ -10,7 +10,7 @@
 # @TEST-EXEC: btest-bg-run manager-1 HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -m %INPUT
 # @TEST-EXEC: btest-bg-run worker-1  HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -m %INPUT
 # @TEST-EXEC: btest-bg-run worker-2  HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -m %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 120
 
 @TEST-START-FILE cluster-layout.zeek
 redef Cluster::nodes = {
diff --git a/testing/btest/core/leaks/bloomfilter.zeek b/testing/btest/core/leaks/bloomfilter.zeek
index 6318251767..607aaf97f9 100644
--- a/testing/btest/core/leaks/bloomfilter.zeek
+++ b/testing/btest/core/leaks/bloomfilter.zeek
@@ -5,7 +5,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b -r $TRACES/wikipedia.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 function test_basic_bloom_filter()
   {
diff --git a/testing/btest/core/leaks/broker/clone_store.zeek b/testing/btest/core/leaks/broker/clone_store.zeek
index bf8732a60f..f45ca6b771 100644
--- a/testing/btest/core/leaks/broker/clone_store.zeek
+++ b/testing/btest/core/leaks/broker/clone_store.zeek
@@ -5,7 +5,7 @@
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run clone "zeek -m -b ../clone.zeek >clone.out"
 # @TEST-EXEC: btest-bg-run master "zeek -b ../master.zeek >master.out"
 
-# @TEST-EXEC: btest-bg-wait 45
+# @TEST-EXEC: btest-bg-wait 90
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff clone/clone.out
 
 @TEST-START-FILE master.zeek
diff --git a/testing/btest/core/leaks/broker/data.zeek b/testing/btest/core/leaks/broker/data.zeek
index c70120b360..c3f7b6cc43 100644
--- a/testing/btest/core/leaks/broker/data.zeek
+++ b/testing/btest/core/leaks/broker/data.zeek
@@ -2,7 +2,7 @@
 # @TEST-GROUP: leaks
 
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b -r $TRACES/http/get.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 45
+# @TEST-EXEC: btest-bg-wait 90
 # @TEST-EXEC: btest-diff zeek/.stdout
 
 type bro_set: set[string];
diff --git a/testing/btest/core/leaks/broker/master_store.zeek b/testing/btest/core/leaks/broker/master_store.zeek
index c8527b8d73..baced9869d 100644
--- a/testing/btest/core/leaks/broker/master_store.zeek
+++ b/testing/btest/core/leaks/broker/master_store.zeek
@@ -2,7 +2,7 @@
 # @TEST-GROUP: leaks
 
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b -r $TRACES/http/get.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 45
+# @TEST-EXEC: btest-bg-wait 90
 
 redef exit_only_after_terminate = T;
 
diff --git a/testing/btest/core/leaks/broker/remote_event.test b/testing/btest/core/leaks/broker/remote_event.test
index 470fc0837a..a70274a19a 100644
--- a/testing/btest/core/leaks/broker/remote_event.test
+++ b/testing/btest/core/leaks/broker/remote_event.test
@@ -5,7 +5,7 @@
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run recv "zeek -m -b ../recv.zeek >recv.out"
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run send "zeek -m -b ../send.zeek >send.out"
 
-# @TEST-EXEC: btest-bg-wait 45
+# @TEST-EXEC: btest-bg-wait 90
 # @TEST-EXEC: btest-diff recv/recv.out
 # @TEST-EXEC: btest-diff send/send.out
 
diff --git a/testing/btest/core/leaks/broker/remote_log.test b/testing/btest/core/leaks/broker/remote_log.test
index 5c303fbfb4..8fb872ae7f 100644
--- a/testing/btest/core/leaks/broker/remote_log.test
+++ b/testing/btest/core/leaks/broker/remote_log.test
@@ -5,7 +5,7 @@
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run recv "zeek -m -b ../recv.zeek >recv.out"
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run send "zeek -m -b ../send.zeek >send.out"
 
-# @TEST-EXEC: btest-bg-wait 45
+# @TEST-EXEC: btest-bg-wait 90
 # @TEST-EXEC: btest-diff recv/recv.out
 # @TEST-EXEC: btest-diff recv/test.log
 # @TEST-EXEC: btest-diff send/send.out
diff --git a/testing/btest/core/leaks/closure-sending.zeek b/testing/btest/core/leaks/closure-sending.zeek
index 0771bbe7dc..32db29097a 100644
--- a/testing/btest/core/leaks/closure-sending.zeek
+++ b/testing/btest/core/leaks/closure-sending.zeek
@@ -5,7 +5,7 @@
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run recv "zeek -m -b ../recv.zeek >recv.out"
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run send "zeek -m -b ../send.zeek >send.out"
 
-# @TEST-EXEC: btest-bg-wait 45
+# @TEST-EXEC: btest-bg-wait 90
 # @TEST-EXEC: btest-diff recv/recv.out
 # @TEST-EXEC: btest-diff send/send.out
 
diff --git a/testing/btest/core/leaks/copy-all-opaques.zeek b/testing/btest/core/leaks/copy-all-opaques.zeek
index 259d971bb2..e8568f4eae 100644
--- a/testing/btest/core/leaks/copy-all-opaques.zeek
+++ b/testing/btest/core/leaks/copy-all-opaques.zeek
@@ -2,7 +2,7 @@
 # @TEST-REQUIRES: zeek --help 2>&1 | grep -q mem-leaks
 
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b -r $TRACES/wikipedia.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 global did_it = F;
 
diff --git a/testing/btest/core/leaks/copy-all-types.zeek b/testing/btest/core/leaks/copy-all-types.zeek
index 3d5d9b958f..24bbb52fa6 100644
--- a/testing/btest/core/leaks/copy-all-types.zeek
+++ b/testing/btest/core/leaks/copy-all-types.zeek
@@ -3,7 +3,7 @@
 # @TEST-REQUIRES: zeek --help 2>&1 | grep -q mem-leaks
 
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b -r $TRACES/wikipedia.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 type MyEnum: enum { ENUMME };
 
diff --git a/testing/btest/core/leaks/dns-nsec3.zeek b/testing/btest/core/leaks/dns-nsec3.zeek
index 29b591b0ee..067a8426a4 100644
--- a/testing/btest/core/leaks/dns-nsec3.zeek
+++ b/testing/btest/core/leaks/dns-nsec3.zeek
@@ -5,7 +5,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -b -C -m -r $TRACES/dnssec/nsec3.pcap %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 @load policy/protocols/dns/auth-addl
 
diff --git a/testing/btest/core/leaks/dns-txt.zeek b/testing/btest/core/leaks/dns-txt.zeek
index 93d049a40b..41e16ff3da 100644
--- a/testing/btest/core/leaks/dns-txt.zeek
+++ b/testing/btest/core/leaks/dns-txt.zeek
@@ -5,7 +5,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -b -m -r $TRACES/wikipedia.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 redef exit_only_after_terminate = T;
 
diff --git a/testing/btest/core/leaks/dns.zeek b/testing/btest/core/leaks/dns.zeek
index e4f8c92cdb..5e3f4c9bf1 100644
--- a/testing/btest/core/leaks/dns.zeek
+++ b/testing/btest/core/leaks/dns.zeek
@@ -5,7 +5,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -b -m -r $TRACES/wikipedia.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 redef exit_only_after_terminate = T;
 
diff --git a/testing/btest/core/leaks/dtls.zeek b/testing/btest/core/leaks/dtls.zeek
index b7f27de91d..b894cb6fb9 100644
--- a/testing/btest/core/leaks/dtls.zeek
+++ b/testing/btest/core/leaks/dtls.zeek
@@ -5,7 +5,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -b -m -r $TRACES/tls/dtls1_0.pcap %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 @load base/protocols/ssl
 
diff --git a/testing/btest/core/leaks/exec.test b/testing/btest/core/leaks/exec.test
index 793954a9dc..f6ddf9998e 100644
--- a/testing/btest/core/leaks/exec.test
+++ b/testing/btest/core/leaks/exec.test
@@ -5,7 +5,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b ../exectest.zeek
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 @TEST-START-FILE exectest.zeek
 
diff --git a/testing/btest/core/leaks/file-analysis-http-get.zeek b/testing/btest/core/leaks/file-analysis-http-get.zeek
index 6e0dae16be..c86e6aea4f 100644
--- a/testing/btest/core/leaks/file-analysis-http-get.zeek
+++ b/testing/btest/core/leaks/file-analysis-http-get.zeek
@@ -5,7 +5,7 @@
 # @TEST-GROUP: leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -r $TRACES/http/get.trace $SCRIPTS/file-analysis-test.zeek %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 redef test_file_analysis_source = "HTTP";
 
diff --git a/testing/btest/core/leaks/function-closures.zeek b/testing/btest/core/leaks/function-closures.zeek
index 829baf046a..1f5ee9eb55 100644
--- a/testing/btest/core/leaks/function-closures.zeek
+++ b/testing/btest/core/leaks/function-closures.zeek
@@ -5,7 +5,7 @@
 # @TEST-GROUP: leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -r $TRACES/http/get.trace $SCRIPTS/file-analysis-test.zeek %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 # maps a function to a vector
 function map_1 (f: function(a: count): count, v: vector of count) : vector of count
diff --git a/testing/btest/core/leaks/gridftp.test b/testing/btest/core/leaks/gridftp.test
index 4028df6b33..fd60776dfd 100644
--- a/testing/btest/core/leaks/gridftp.test
+++ b/testing/btest/core/leaks/gridftp.test
@@ -5,7 +5,7 @@
 # @TEST-GROUP: leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -r $TRACES/globus-url-copy.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 @load base/protocols/ftp/gridftp
 
diff --git a/testing/btest/core/leaks/gtp_opt_header.test b/testing/btest/core/leaks/gtp_opt_header.test
index e11ecf1942..ddfdd133d7 100644
--- a/testing/btest/core/leaks/gtp_opt_header.test
+++ b/testing/btest/core/leaks/gtp_opt_header.test
@@ -5,7 +5,7 @@
 # @TEST-GROUP: leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -r $TRACES/tunnels/gtp/gtp6_gtp_0x32.pcap %INPUT >out
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 # Some GTPv1 headers have some optional fields totaling to a 4-byte extension
 # of the mandatory header.
diff --git a/testing/btest/core/leaks/hll_cluster.zeek b/testing/btest/core/leaks/hll_cluster.zeek
index 7d2b4c8850..90379fffa4 100644
--- a/testing/btest/core/leaks/hll_cluster.zeek
+++ b/testing/btest/core/leaks/hll_cluster.zeek
@@ -11,7 +11,7 @@
 # @TEST-EXEC: btest-bg-run manager-1 HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -m %INPUT
 # @TEST-EXEC: btest-bg-run worker-1 HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -m runnumber=1 %INPUT
 # @TEST-EXEC: btest-bg-run worker-2 HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -m runnumber=2 %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 120
 #
 # @TEST-EXEC: btest-diff manager-1/.stdout
 # @TEST-EXEC: btest-diff worker-1/.stdout
diff --git a/testing/btest/core/leaks/hook.zeek b/testing/btest/core/leaks/hook.zeek
index 5f25a8a011..039d830bb8 100644
--- a/testing/btest/core/leaks/hook.zeek
+++ b/testing/btest/core/leaks/hook.zeek
@@ -5,7 +5,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b -r $TRACES/wikipedia.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 type rec: record {
 	a: count;
diff --git a/testing/btest/core/leaks/http-connect.zeek b/testing/btest/core/leaks/http-connect.zeek
index c18871c55d..60de095030 100644
--- a/testing/btest/core/leaks/http-connect.zeek
+++ b/testing/btest/core/leaks/http-connect.zeek
@@ -5,7 +5,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -b -m -r $TRACES/http/connect-with-smtp.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 @load base/protocols/conn
 @load base/protocols/http
diff --git a/testing/btest/core/leaks/incr-vec-expr.test b/testing/btest/core/leaks/incr-vec-expr.test
index ff6117feea..c562c7c3ed 100644
--- a/testing/btest/core/leaks/incr-vec-expr.test
+++ b/testing/btest/core/leaks/incr-vec-expr.test
@@ -5,7 +5,7 @@
 # @TEST-GROUP: leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -b -m -r $TRACES/chksums/ip4-udp-good-chksum.pcap %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 type rec: record {
     a: count;
diff --git a/testing/btest/core/leaks/input-basic.zeek b/testing/btest/core/leaks/input-basic.zeek
index 8903fa0409..773cedfe1f 100644
--- a/testing/btest/core/leaks/input-basic.zeek
+++ b/testing/btest/core/leaks/input-basic.zeek
@@ -5,7 +5,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 redef exit_only_after_terminate = T;
 
diff --git a/testing/btest/core/leaks/input-errors.zeek b/testing/btest/core/leaks/input-errors.zeek
index 7262e16c06..e5d4aafa47 100644
--- a/testing/btest/core/leaks/input-errors.zeek
+++ b/testing/btest/core/leaks/input-errors.zeek
@@ -6,7 +6,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 @TEST-START-FILE input.log
 #separator \x09
diff --git a/testing/btest/core/leaks/input-missing-enum.zeek b/testing/btest/core/leaks/input-missing-enum.zeek
index 9c34d163dd..589b9e5cc6 100644
--- a/testing/btest/core/leaks/input-missing-enum.zeek
+++ b/testing/btest/core/leaks/input-missing-enum.zeek
@@ -5,7 +5,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 @TEST-START-FILE input.log
 #fields	e	i
diff --git a/testing/btest/core/leaks/input-optional-event.zeek b/testing/btest/core/leaks/input-optional-event.zeek
index 500a076ed6..92c4c4dc19 100644
--- a/testing/btest/core/leaks/input-optional-event.zeek
+++ b/testing/btest/core/leaks/input-optional-event.zeek
@@ -5,7 +5,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 @TEST-START-FILE input.log
 #separator \x09
diff --git a/testing/btest/core/leaks/input-optional-table.zeek b/testing/btest/core/leaks/input-optional-table.zeek
index 09f50fb8c8..e73bd1b234 100644
--- a/testing/btest/core/leaks/input-optional-table.zeek
+++ b/testing/btest/core/leaks/input-optional-table.zeek
@@ -5,7 +5,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 @TEST-START-FILE input.log
 #separator \x09
diff --git a/testing/btest/core/leaks/input-patterns.zeek b/testing/btest/core/leaks/input-patterns.zeek
index 62a7976434..37b37458d1 100644
--- a/testing/btest/core/leaks/input-patterns.zeek
+++ b/testing/btest/core/leaks/input-patterns.zeek
@@ -5,7 +5,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 redef exit_only_after_terminate = T;
 
diff --git a/testing/btest/core/leaks/input-raw.zeek b/testing/btest/core/leaks/input-raw.zeek
index 938875987c..5b8e19c733 100644
--- a/testing/btest/core/leaks/input-raw.zeek
+++ b/testing/btest/core/leaks/input-raw.zeek
@@ -6,11 +6,11 @@
 #
 # @TEST-EXEC: cp input1.log input.log
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b %INPUT 
-# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got2 60 || (btest-bg-wait -k 1 && false)
+# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got2 90 || (btest-bg-wait -k 1 && false)
 # @TEST-EXEC: cat input2.log >> input.log
-# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got6 15 || (btest-bg-wait -k 1 && false)
+# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got6 30 || (btest-bg-wait -k 1 && false)
 # @TEST-EXEC: cat input3.log >> input.log
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 120
 
 redef exit_only_after_terminate = T;
 
diff --git a/testing/btest/core/leaks/input-reread.zeek b/testing/btest/core/leaks/input-reread.zeek
index 6621c14574..dd5dda333d 100644
--- a/testing/btest/core/leaks/input-reread.zeek
+++ b/testing/btest/core/leaks/input-reread.zeek
@@ -6,15 +6,15 @@
 #
 # @TEST-EXEC: cp input1.log input.log
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b %INPUT
-# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got2 60 || (btest-bg-wait -k 1 && false)
+# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got2 90 || (btest-bg-wait -k 1 && false)
 # @TEST-EXEC: cp input2.log input.log
-# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got4 10 || (btest-bg-wait -k 1 && false)
+# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got4 20 || (btest-bg-wait -k 1 && false)
 # @TEST-EXEC: cp input3.log input.log
-# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got6 10 || (btest-bg-wait -k 1 && false)
+# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got6 20 || (btest-bg-wait -k 1 && false)
 # @TEST-EXEC: cp input4.log input.log
-# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got8 10 || (btest-bg-wait -k 1 && false)
+# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got8 20 || (btest-bg-wait -k 1 && false)
 # @TEST-EXEC: cp input5.log input.log
-# @TEST-EXEC: btest-bg-wait 120
+# @TEST-EXEC: btest-bg-wait 150
 
 @TEST-START-FILE input1.log
 #separator \x09
diff --git a/testing/btest/core/leaks/input-sqlite.zeek b/testing/btest/core/leaks/input-sqlite.zeek
index 9606779c7b..50d9399a88 100644
--- a/testing/btest/core/leaks/input-sqlite.zeek
+++ b/testing/btest/core/leaks/input-sqlite.zeek
@@ -7,7 +7,7 @@
 #
 # @TEST-EXEC: cat conn.sql | sqlite3 conn.sqlite
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 @TEST-START-FILE conn.sql
 PRAGMA foreign_keys=OFF;
diff --git a/testing/btest/core/leaks/input-with-remove.zeek b/testing/btest/core/leaks/input-with-remove.zeek
index 2a55c8a3fa..e19a4312fc 100644
--- a/testing/btest/core/leaks/input-with-remove.zeek
+++ b/testing/btest/core/leaks/input-with-remove.zeek
@@ -5,7 +5,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -b -m -r $TRACES/wikipedia.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 @load base/frameworks/input
 
diff --git a/testing/btest/core/leaks/ip-in-ip.test b/testing/btest/core/leaks/ip-in-ip.test
index 41cc6a7724..96dfadc8a7 100644
--- a/testing/btest/core/leaks/ip-in-ip.test
+++ b/testing/btest/core/leaks/ip-in-ip.test
@@ -7,7 +7,7 @@
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek1 zeek -m -b -r $TRACES/tunnels/6in6.pcap %INPUT
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek2 zeek -m -b -r $TRACES/tunnels/6in6in6.pcap %INPUT
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek3 zeek -m -b -r $TRACES/tunnels/6in6-tunnel-change.pcap %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 120
 
 event new_connection(c: connection)
 	{
diff --git a/testing/btest/core/leaks/ipv6_ext_headers.test b/testing/btest/core/leaks/ipv6_ext_headers.test
index 8836cb6f33..18e7dcb964 100644
--- a/testing/btest/core/leaks/ipv6_ext_headers.test
+++ b/testing/btest/core/leaks/ipv6_ext_headers.test
@@ -5,7 +5,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b -r $TRACES/ipv6-hbh-routing0.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 # Just check that the event is raised correctly for a packet containing
 # extension headers.
diff --git a/testing/btest/core/leaks/irc.test b/testing/btest/core/leaks/irc.test
index 7b3130a553..3dce3a0ad2 100644
--- a/testing/btest/core/leaks/irc.test
+++ b/testing/btest/core/leaks/irc.test
@@ -5,7 +5,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -r $TRACES/irc-dcc-send.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 event irc_names_info(c: connection, is_orig: bool, c_type: string, channel: string, users: string_set)
 	{
diff --git a/testing/btest/core/leaks/krb-service-name.test b/testing/btest/core/leaks/krb-service-name.test
index 5b07a48633..0263df5a60 100644
--- a/testing/btest/core/leaks/krb-service-name.test
+++ b/testing/btest/core/leaks/krb-service-name.test
@@ -5,4 +5,4 @@
 # @TEST-GROUP: leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -r $TRACES/krb/optional-service-name.pcap
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
diff --git a/testing/btest/core/leaks/krb.test b/testing/btest/core/leaks/krb.test
index a16711b850..cea492d196 100644
--- a/testing/btest/core/leaks/krb.test
+++ b/testing/btest/core/leaks/krb.test
@@ -5,6 +5,6 @@
 # @TEST-GROUP: leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -b -m -r $TRACES/krb/kinit.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 30
+# @TEST-EXEC: btest-bg-wait 90
 
-@load base/protocols/krb
\ No newline at end of file
+@load base/protocols/krb
diff --git a/testing/btest/core/leaks/kv-iteration.zeek b/testing/btest/core/leaks/kv-iteration.zeek
index 7496698e42..c349a68d59 100644
--- a/testing/btest/core/leaks/kv-iteration.zeek
+++ b/testing/btest/core/leaks/kv-iteration.zeek
@@ -2,7 +2,7 @@
 # @TEST-REQUIRES: zeek --help 2>&1 | grep -q mem-leaks
 
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b -r $TRACES/http/get.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 event new_connection(c: connection)
 	{
diff --git a/testing/btest/core/leaks/mysql.test b/testing/btest/core/leaks/mysql.test
index 07f3239885..12d1ec897f 100644
--- a/testing/btest/core/leaks/mysql.test
+++ b/testing/btest/core/leaks/mysql.test
@@ -5,6 +5,6 @@
 # @TEST-GROUP: leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -b -m -r $TRACES/mysql/mysql.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 @load base/protocols/mysql
diff --git a/testing/btest/core/leaks/pattern.zeek b/testing/btest/core/leaks/pattern.zeek
index e223e64b57..1b14c6dd78 100644
--- a/testing/btest/core/leaks/pattern.zeek
+++ b/testing/btest/core/leaks/pattern.zeek
@@ -2,7 +2,7 @@
 # @TEST-REQUIRES: zeek --help 2>&1 | grep -q mem-leaks
 
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b -r $TRACES/http/get.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 function test_case(msg: string, expect: bool)
     {
diff --git a/testing/btest/core/leaks/pe.test b/testing/btest/core/leaks/pe.test
index 3ff64b587f..baca8b3217 100644
--- a/testing/btest/core/leaks/pe.test
+++ b/testing/btest/core/leaks/pe.test
@@ -5,7 +5,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -b -m -r $TRACES/pe/pe.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 @load base/protocols/ftp
 @load base/files/pe
diff --git a/testing/btest/core/leaks/print-log.zeek b/testing/btest/core/leaks/print-log.zeek
index 3130625e50..c37886e2cd 100644
--- a/testing/btest/core/leaks/print-log.zeek
+++ b/testing/btest/core/leaks/print-log.zeek
@@ -3,7 +3,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b -r $TRACES/http/get.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 redef Log::print_to_log = Log::REDIRECT_ALL;
 
@@ -11,4 +11,4 @@ event new_connection(c: connection)
     {
     print "hello world ,";
     print 2,T;
-    }
\ No newline at end of file
+    }
diff --git a/testing/btest/core/leaks/radius.test b/testing/btest/core/leaks/radius.test
index e6d1d66bea..3eb5ac7b4e 100644
--- a/testing/btest/core/leaks/radius.test
+++ b/testing/btest/core/leaks/radius.test
@@ -5,6 +5,6 @@
 # @TEST-GROUP: leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -b -m -r $TRACES/radius/radius.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 @load base/protocols/radius
diff --git a/testing/btest/core/leaks/returnwhen.zeek b/testing/btest/core/leaks/returnwhen.zeek
index 689adf1256..8dc5bb3992 100644
--- a/testing/btest/core/leaks/returnwhen.zeek
+++ b/testing/btest/core/leaks/returnwhen.zeek
@@ -5,7 +5,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: btest-bg-run zeek HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local zeek -m -b %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 redef exit_only_after_terminate = T;
 
diff --git a/testing/btest/core/leaks/set.zeek b/testing/btest/core/leaks/set.zeek
index a902fe9797..9b1c0b8f4a 100644
--- a/testing/btest/core/leaks/set.zeek
+++ b/testing/btest/core/leaks/set.zeek
@@ -2,7 +2,7 @@
 # @TEST-REQUIRES: zeek --help 2>&1 | grep -q mem-leaks
 
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b -r $TRACES/http/get.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 function test_case(msg: string, expect: bool)
     {
diff --git a/testing/btest/core/leaks/sip.test b/testing/btest/core/leaks/sip.test
index 25125e1816..5ce8a29210 100644
--- a/testing/btest/core/leaks/sip.test
+++ b/testing/btest/core/leaks/sip.test
@@ -5,6 +5,6 @@
 # @TEST-GROUP: leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -b -m -r $TRACES/sip/wireshark.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 @load base/protocols/sip
diff --git a/testing/btest/core/leaks/smtp_attachment.test b/testing/btest/core/leaks/smtp_attachment.test
index 63eb1e8b5c..8e11735327 100644
--- a/testing/btest/core/leaks/smtp_attachment.test
+++ b/testing/btest/core/leaks/smtp_attachment.test
@@ -5,6 +5,6 @@
 # @TEST-GROUP: leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -b -m -r $TRACES/smtp.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 @load base/protocols/smtp
diff --git a/testing/btest/core/leaks/snmp.test b/testing/btest/core/leaks/snmp.test
index f6769f2602..ee678dfc84 100644
--- a/testing/btest/core/leaks/snmp.test
+++ b/testing/btest/core/leaks/snmp.test
@@ -5,6 +5,6 @@
 # @TEST-GROUP: leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -b -m -r $TRACES/snmp/snmpv1_get.pcap -r $TRACES/snmp/snmpv1_get_short.pcap -r $TRACES/snmp/snmpv1_set.pcap -r $TRACES/snmp/snmpv1_trap.pcap -r $TRACES/snmp/snmpv2_get_bulk.pcap -r $TRACES/snmp/snmpv2_get_next.pcap -r $TRACES/snmp/snmpv2_get.pcap -r $TRACES/snmp/snmpv3_get_next.pcap $SCRIPTS/snmp-test.zeek %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 @load base/protocols/snmp
diff --git a/testing/btest/core/leaks/ssh.test b/testing/btest/core/leaks/ssh.test
index a43654705d..735e8b3e1d 100644
--- a/testing/btest/core/leaks/ssh.test
+++ b/testing/btest/core/leaks/ssh.test
@@ -5,6 +5,6 @@
 # @TEST-GROUP: leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -b -m -r $TRACES/ssh/ssh.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 @load base/protocols/ssh
diff --git a/testing/btest/core/leaks/stats.zeek b/testing/btest/core/leaks/stats.zeek
index f541b4fb79..11c598ffc8 100644
--- a/testing/btest/core/leaks/stats.zeek
+++ b/testing/btest/core/leaks/stats.zeek
@@ -5,7 +5,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -r $TRACES/wikipedia.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 @load policy/misc/stats
 
diff --git a/testing/btest/core/leaks/string-indexing.zeek b/testing/btest/core/leaks/string-indexing.zeek
index 1ac28efe63..2f5982e2ec 100644
--- a/testing/btest/core/leaks/string-indexing.zeek
+++ b/testing/btest/core/leaks/string-indexing.zeek
@@ -5,7 +5,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b -r $TRACES/wikipedia.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 
 event new_connection(c: connection)
diff --git a/testing/btest/core/leaks/switch-statement.zeek b/testing/btest/core/leaks/switch-statement.zeek
index b0c906ec46..c55fbe57b4 100644
--- a/testing/btest/core/leaks/switch-statement.zeek
+++ b/testing/btest/core/leaks/switch-statement.zeek
@@ -5,7 +5,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b -r $TRACES/wikipedia.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 type MyEnum: enum {
 	RED,
diff --git a/testing/btest/core/leaks/teredo.zeek b/testing/btest/core/leaks/teredo.zeek
index 2841679b0e..a2048ffb89 100644
--- a/testing/btest/core/leaks/teredo.zeek
+++ b/testing/btest/core/leaks/teredo.zeek
@@ -5,7 +5,7 @@
 # @TEST-GROUP: leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -r $TRACES/tunnels/Teredo.pcap %INPUT >output
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 function print_teredo(name: string, outer: connection, inner: teredo_hdr)
 	{
diff --git a/testing/btest/core/leaks/test-all.zeek b/testing/btest/core/leaks/test-all.zeek
index 79bc8c916a..c437c439f0 100644
--- a/testing/btest/core/leaks/test-all.zeek
+++ b/testing/btest/core/leaks/test-all.zeek
@@ -5,4 +5,4 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -r $TRACES/wikipedia.trace test-all-policy
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
diff --git a/testing/btest/core/leaks/to_json.zeek b/testing/btest/core/leaks/to_json.zeek
index 170de3c2eb..69b906a9cd 100644
--- a/testing/btest/core/leaks/to_json.zeek
+++ b/testing/btest/core/leaks/to_json.zeek
@@ -5,7 +5,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b -r $TRACES/wikipedia.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 type color: enum { Red, White, Blue };
 
diff --git a/testing/btest/core/leaks/vector-indexing.zeek b/testing/btest/core/leaks/vector-indexing.zeek
index 540913bd08..0488abf607 100644
--- a/testing/btest/core/leaks/vector-indexing.zeek
+++ b/testing/btest/core/leaks/vector-indexing.zeek
@@ -5,7 +5,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b -r $TRACES/wikipedia.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 global did_it = F;
 
diff --git a/testing/btest/core/leaks/vector-val-bifs.test b/testing/btest/core/leaks/vector-val-bifs.test
index a552279a57..b4519263d1 100644
--- a/testing/btest/core/leaks/vector-val-bifs.test
+++ b/testing/btest/core/leaks/vector-val-bifs.test
@@ -9,7 +9,7 @@
 # leaked that memeory.
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b -r $TRACES/ftp/ipv4.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 function myfunc(aa: interval, bb: interval): int
     {
diff --git a/testing/btest/core/leaks/while.zeek b/testing/btest/core/leaks/while.zeek
index f490c9a13d..35241b8f6a 100644
--- a/testing/btest/core/leaks/while.zeek
+++ b/testing/btest/core/leaks/while.zeek
@@ -2,7 +2,7 @@
 # @TEST-REQUIRES: zeek --help 2>&1 | grep -q mem-leaks
 
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -m -b -r $TRACES/http/get.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 function test_noop()
 	{
diff --git a/testing/btest/core/leaks/x509_ocsp_verify.zeek b/testing/btest/core/leaks/x509_ocsp_verify.zeek
index 8d6cd5aa3e..2b12fc6cd8 100644
--- a/testing/btest/core/leaks/x509_ocsp_verify.zeek
+++ b/testing/btest/core/leaks/x509_ocsp_verify.zeek
@@ -5,7 +5,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -b -m -r $TRACES/tls/ocsp-stapling.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 @load base/protocols/ssl
 
diff --git a/testing/btest/core/leaks/x509_verify.zeek b/testing/btest/core/leaks/x509_verify.zeek
index 3989c2b850..0dbf8ed08c 100644
--- a/testing/btest/core/leaks/x509_verify.zeek
+++ b/testing/btest/core/leaks/x509_verify.zeek
@@ -5,7 +5,7 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local btest-bg-run zeek zeek -b -m -r $TRACES/tls/tls-expired-cert.trace %INPUT
-# @TEST-EXEC: btest-bg-wait 60
+# @TEST-EXEC: btest-bg-wait 90
 
 @load base/protocols/ssl
 
diff --git a/testing/btest/scripts/base/frameworks/config/updates.zeek b/testing/btest/scripts/base/frameworks/config/updates.zeek
index 09bcc9d198..6097cab079 100644
--- a/testing/btest/scripts/base/frameworks/config/updates.zeek
+++ b/testing/btest/scripts/base/frameworks/config/updates.zeek
@@ -1,11 +1,11 @@
 # @TEST-EXEC: btest-bg-run zeek zeek -b %INPUT
-# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got1 10 || (btest-bg-wait -k 1 && false)
+# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got1 20 || (btest-bg-wait -k 1 && false)
 # @TEST-EXEC: mv configfile2 configfile
-# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got2 10 || (btest-bg-wait -k 1 && false)
+# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got2 20 || (btest-bg-wait -k 1 && false)
 # @TEST-EXEC: mv configfile3 configfile
-# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got3 10 || (btest-bg-wait -k 1 && false)
+# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/got3 20 || (btest-bg-wait -k 1 && false)
 # @TEST-EXEC: mv configfile4 configfile
-# @TEST-EXEC: btest-bg-wait 10
+# @TEST-EXEC: btest-bg-wait 20
 # @TEST-EXEC: btest-diff zeek/config.log
 
 @load base/frameworks/config
diff --git a/testing/btest/scripts/base/frameworks/intel/remove-item-cluster.zeek b/testing/btest/scripts/base/frameworks/intel/remove-item-cluster.zeek
index 98c8b55736..38be4d51b3 100644
--- a/testing/btest/scripts/base/frameworks/intel/remove-item-cluster.zeek
+++ b/testing/btest/scripts/base/frameworks/intel/remove-item-cluster.zeek
@@ -3,7 +3,7 @@
 #
 # @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
 # @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-wait -k 13
+# @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-1/.stdout
 # @TEST-EXEC: btest-diff manager-1/intel.log
@@ -36,20 +36,23 @@ event test_worker()
 	Intel::seen([$host=10.10.10.10, $where=Intel::IN_ANYWHERE]);
 	}
 
-event Cluster::node_up(name: string, id: string)
+event ready()
 	{
 	# Insert the data once all workers are connected.
-	if ( Cluster::local_node_type() == Cluster::MANAGER && Cluster::worker_count == 1 )
-		{
-		Intel::insert([$indicator="192.168.0.1", $indicator_type=Intel::ADDR, $meta=[$source="source1"]]);
-		Intel::insert([$indicator="192.168.0.2", $indicator_type=Intel::ADDR, $meta=[$source="source1"]]);
-		Intel::insert([$indicator="192.168.0.2", $indicator_type=Intel::ADDR, $meta=[$source="source2"]]);
-		Intel::insert([$indicator="192.168.1.2", $indicator_type=Intel::ADDR, $meta=[$source="source1"]]);
-		Intel::insert([$indicator="192.168.1.2", $indicator_type=Intel::ADDR, $meta=[$source="source2"]]);
-		Intel::insert([$indicator="10.10.10.10", $indicator_type=Intel::ADDR, $meta=[$source="end"]]);
+	Intel::insert([$indicator="192.168.0.1", $indicator_type=Intel::ADDR, $meta=[$source="source1"]]);
+	Intel::insert([$indicator="192.168.0.2", $indicator_type=Intel::ADDR, $meta=[$source="source1"]]);
+	Intel::insert([$indicator="192.168.0.2", $indicator_type=Intel::ADDR, $meta=[$source="source2"]]);
+	Intel::insert([$indicator="192.168.1.2", $indicator_type=Intel::ADDR, $meta=[$source="source1"]]);
+	Intel::insert([$indicator="192.168.1.2", $indicator_type=Intel::ADDR, $meta=[$source="source2"]]);
+	Intel::insert([$indicator="10.10.10.10", $indicator_type=Intel::ADDR, $meta=[$source="end"]]);
 
-		event test_manager();
-		}
+	event test_manager();
+	}
+
+event Cluster::node_up(name: string, id: string)
+	{
+	if ( Cluster::node == "worker-1" )
+		Broker::publish(Cluster::manager_topic, ready);
 	}
 
 global worker_data = 0;
@@ -74,19 +77,13 @@ event remove_indicator(item: Item)
 	print fmt("Purging %s.", item$indicator);
 	}
 
-event die()
-	{
-	terminate();
-	}
-
 event Intel::log_intel(rec: Intel::Info)
 	{
 	print "Logging intel hit!";
-	schedule 2sec { die() };
+	terminate();
 	}
 
 event Cluster::node_down(name: string, id: string)
 	{
-	# Cascading termination
-	schedule 2sec { die() };
+	terminate();
 	}
diff --git a/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek b/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek
index 067193de8c..06aeb6e235 100644
--- a/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek
+++ b/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek
@@ -5,7 +5,7 @@
 # @TEST-EXEC: btest-bg-run manager-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=manager-1 zeek %INPUT"
 # @TEST-EXEC: btest-bg-run worker-1  "cp ../cluster-layout.zeek . && CLUSTER_NODE=worker-1 zeek --pseudo-realtime -C -r $TRACES/tls/ecdhe.pcap %INPUT"
 
-# @TEST-EXEC: $SCRIPTS/wait-for-pid $(cat worker-1/.pid) 10 || (btest-bg-wait -k 1 && false)
+# @TEST-EXEC: $SCRIPTS/wait-for-file manager-1/lost 10 || (btest-bg-wait -k 1 && false)
 
 # @TEST-EXEC: btest-bg-run worker-2  "cp ../cluster-layout.zeek . && CLUSTER_NODE=worker-2 zeek --pseudo-realtime -C -r $TRACES/tls/ecdhe.pcap %INPUT"
 # @TEST-EXEC: btest-bg-wait 20
@@ -59,6 +59,7 @@ global peers_lost = 0;
 event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string)
 	{
 	++peers_lost;
+	system("touch lost");
 
 	if ( peers_lost == 2 )
 		schedule 2sec { terminate_me() };
diff --git a/testing/scripts/wait-for-pid b/testing/scripts/wait-for-pid
deleted file mode 100755
index 7aa0a927fe..0000000000
--- a/testing/scripts/wait-for-pid
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env bash
-
-# Sleeps until a process id no longer exists.
-
-if [[ $# -ne 2 ]]; then
-  >&2 echo "usage: $0 <pid to wait for> <max secs to wait>"
-  exit 1
-fi
-
-wait_pid=$1
-max_wait=$2
-wait_count=0
-
-while kill -0 $wait_pid &> /dev/null; do
-  let "wait_count += 1"
-
-  if [[ $wait_count -ge $max_wait ]]; then
-    >&2 echo "error: process $wait_pid still exists after $max_wait seconds"
-    exit 1
-  fi
-
-  sleep 1
-done
-