diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
index 3f1683f732..fb6ff09a4d 100644
--- a/.github/workflows/core.yml
+++ b/.github/workflows/core.yml
@@ -10,7 +10,7 @@ jobs:
   unittests:
     name: unit_tests
     runs-on: macOS-latest
-    timeout-minutes: 45
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v1
         with:
@@ -22,7 +22,7 @@ jobs:
   tsan:
     name: tsan
     runs-on: ubuntu-18.04
-    timeout-minutes: 45
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v1
         with:
@@ -38,7 +38,7 @@ jobs:
   asan:
     name: asan
     runs-on: ubuntu-18.04
-    timeout-minutes: 45
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v1
         with:
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
new file mode 100644
index 0000000000..1546e703c6
--- /dev/null
+++ b/.github/workflows/coverage.yml
@@ -0,0 +1,28 @@
+name: coverage
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    paths:
+      - 'library/common/**'
+      - 'test/**'
+
+jobs:
+  coverage:
+    name: coverage
+    runs-on: ubuntu-18.04
+    timeout-minutes: 60
+    steps:
+      - uses: actions/checkout@v1
+        with:
+          submodules: true
+      - name: 'Install dependencies'
+        run: ./ci/linux_ci_setup.sh
+      - name: 'Run coverage'
+        run: |
+          export PATH=/usr/lib/llvm-8/bin:$PATH
+          export CC=clang
+          export CXX=clang++
+          ./test/coverage/run_coverage.sh
diff --git a/.gitignore b/.gitignore
index 9e276f5d94..d58a921fbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,8 @@
+.aswb
+.DS_Store
+.idea
+.ijwb
+.vscode
 /bazel-*
 /build_*
 /dist/*pom.xml
@@ -7,15 +12,13 @@
 /dist/Envoy.framework
 /dist/*.asc
 /dist/*.sha256
-.DS_Store
 /generated
-.idea
-.ijwb
-.aswb
-*.pyc
-tags
+/test/coverage/BUILD
 /tmp
+*.pyc
 *.tulsiconf-user
-tulsi-workspace
-.vscode
 *.xcodeproj
+clang.bazelrc
+user.bazelrc
+tags
+tulsi-workspace
diff --git a/ci/linux_ci_setup.sh b/ci/linux_ci_setup.sh
index f82737e05d..9611757f00 100755
--- a/ci/linux_ci_setup.sh
+++ b/ci/linux_ci_setup.sh
@@ -32,6 +32,10 @@ sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-8 1
 sudo apt-get install gnupg2
 gpg --version
 
+# buildifier
+sudo wget -O /usr/local/bin/buildifier https://github.com/bazelbuild/buildtools/releases/download/2.2.1/buildifier
+sudo chmod +x /usr/local/bin/buildifier
+
 # bazelisk
 sudo wget -O /usr/local/bin/bazel https://github.com/bazelbuild/bazelisk/releases/download/v0.0.8/bazelisk-linux-amd64
 sudo chmod +x /usr/local/bin/bazel
diff --git a/envoy b/envoy
index 15878f93fd..9931239df9 160000
--- a/envoy
+++ b/envoy
@@ -1 +1 @@
-Subproject commit 15878f93fd63fc96bb08499ccedc8ce51b2d1115
+Subproject commit 9931239df99abda9ec69d450177730826d985c25
diff --git a/test/coverage/run_coverage.sh b/test/coverage/run_coverage.sh
new file mode 100755
index 0000000000..b231ba5139
--- /dev/null
+++ b/test/coverage/run_coverage.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+
+export REPOSITORY="@envoy"
+export EXTRA_QUERY_PATHS="//test/..."
+export BUILD_PATH="test/coverage/BUILD"
+export ONLY_EXTRA_QUERY_PATHS="true"
+
+envoy/test/run_envoy_bazel_coverage.sh
diff --git a/test/integration/dispatcher_integration_test.cc b/test/integration/dispatcher_integration_test.cc
index f5a30ee049..c158447273 100644
--- a/test/integration/dispatcher_integration_test.cc
+++ b/test/integration/dispatcher_integration_test.cc
@@ -68,7 +68,7 @@ class DispatcherIntegrationTest : public BaseIntegrationTest,
 
   static std::string bootstrap_config() {
     // At least one empty filter chain needs to be specified.
-    return ConfigHelper::BASE_CONFIG + R"EOF(
+    return ConfigHelper::baseConfig() + R"EOF(
     filter_chains:
       filters:
     )EOF";