diff --git a/.azure-pipelines/linux.yml b/.azure-pipelines/linux.yml
index 467206806b10b..462332c758285 100644
--- a/.azure-pipelines/linux.yml
+++ b/.azure-pipelines/linux.yml
@@ -5,7 +5,7 @@ resources:
 
 jobs:
 - job: BuildEnvoy
-  timeoutInMinutes: 120
+  timeoutInMinutes: 360
   pool:
     vmImage: 'Ubuntu 16.04'
   container: envoy-build
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 55a6921adcae9..ccfdd86ecd283 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -175,17 +175,6 @@ jobs:
        - run: docs/publish.sh
        - store_artifacts:
            path: generated/docs
-   mac:
-     macos:
-       xcode: "9.3.1"
-     environment:
-       BAZEL_REMOTE_CACHE: https://storage.googleapis.com/envoy-circleci-bazel-cache/
-     steps:
-       - run: sudo ntpdate -vu time.apple.com
-       - run: rm -rf /home/circleci/project/.git # CircleCI git caching is likely broken
-       - checkout
-       - run: ci/mac_ci_setup.sh
-       - run: ci/mac_ci_steps.sh
 
 workflows:
   version: 2
@@ -214,4 +203,3 @@ workflows:
           filters:
             tags:
               only: /^v.*/
-      - mac
diff --git a/ci/mac_ci_steps.sh b/ci/mac_ci_steps.sh
index 4ae42bdf268ae..3f8c95c9368bc 100755
--- a/ci/mac_ci_steps.sh
+++ b/ci/mac_ci_steps.sh
@@ -14,6 +14,7 @@ df -h
 . "$(dirname "$0")"/setup_gcs_cache.sh
 
 BAZEL_BUILD_OPTIONS="--curses=no --show_task_finish --verbose_failures ${BAZEL_BUILD_EXTRA_OPTIONS} \
+  --deleted_packages //test/extensions/quic_listeners/quiche/platform \
   --action_env=PATH=/usr/local/bin:/opt/local/bin:/usr/bin:/bin"
 # TODO(zuercher): remove --flaky_test_attempts when https://github.com/envoyproxy/envoy/issues/2428
 # is resolved.
@@ -23,5 +24,5 @@ BAZEL_TEST_OPTIONS="${BAZEL_BUILD_OPTIONS} --test_output=all --flaky_test_attemp
 # is somewhat more deterministic (rather than interleaving the build
 # and test steps).
 
-bazel build ${BAZEL_BUILD_OPTIONS} //source/... //test/integration/...
-bazel test ${BAZEL_TEST_OPTIONS} //test/integration/...
+bazel build ${BAZEL_BUILD_OPTIONS} //source/... //test/...
+bazel test ${BAZEL_TEST_OPTIONS} //test/...