diff --git a/.cirrus.yml b/.cirrus.yml
index 437388adf6..813835e56a 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -3,8 +3,8 @@ btest_jobs: &BTEST_JOBS 8
 btest_retries: &BTEST_RETRIES 2
 memory: &MEMORY 6GB
 
-config: &CONFIG --build-type=release --enable-cpp-tests
-memcheck_config: &MEMCHECK_CONFIG --build-type=debug --enable-cpp-tests --sanitizers=address --enable-fuzzers
+config: &CONFIG --build-type=release --enable-cpp-tests  --disable-broker-tests
+memcheck_config: &MEMCHECK_CONFIG --build-type=debug --enable-cpp-tests --disable-broker-tests --sanitizers=address --enable-fuzzers
 
 resources_template: &RESOURCES_TEMPLATE
   cpu: *CPUS
diff --git a/CHANGES b/CHANGES
index 231226e8f2..759719ccdf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,12 @@
 
+3.2.0-dev.508 | 2020-05-13 11:16:05 -0700
+
+  * Disable broker tests from building on the CI (Tim Wojtulewicz, Corelight)
+
+    This results in a ~10% reduction in build time.
+
+  * Disable broker documentation examples if disabling broker tests (Tim Wojtulewicz, Corelight)
+
 3.2.0-dev.505 | 2020-05-12 18:52:19 -0700
 
   * Use zeek::detail namespace for fuzzer utils (Jon Siwek, Corelight)
diff --git a/VERSION b/VERSION
index b55b9311f5..5b902a0fab 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.2.0-dev.505
+3.2.0-dev.508
diff --git a/aux/broker b/aux/broker
index 8b2c9a9e1e..70fa315e8b 160000
--- a/aux/broker
+++ b/aux/broker
@@ -1 +1 @@
-Subproject commit 8b2c9a9e1e67d145af442fa2175dcb18b643a317
+Subproject commit 70fa315e8b777056073a9e67f42b99573ef18231
diff --git a/configure b/configure
index 1fd036f169..a800092048 100755
--- a/configure
+++ b/configure
@@ -271,7 +271,8 @@ while [ $# -ne 0 ]; do
             append_cache_entry DISABLE_PYTHON_BINDINGS     BOOL   true
             ;;
         --disable-broker-tests)
-            append_cache_entry BROKER_DISABLE_TESTS     BOOL   true
+            append_cache_entry BROKER_DISABLE_TESTS        BOOL true
+            append_cache_entry BROKER_DISABLE_DOC_EXAMPLES BOOL true
             ;;
         --with-openssl=*)
             append_cache_entry OPENSSL_ROOT_DIR PATH $optarg