diff --git a/.circleci/config.yml b/.circleci/config.yml
index db59eae9322..29d1bcf2a92 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -77,6 +77,7 @@ jobs:
     steps:
       - run: sudo ntpdate -vu time.apple.com
       - run: brew install bazel cmake coreutils go libtool ninja wget
+      - run: sudo ln -s /usr/local/bin/gsha256sum /usr/local/bin/sha256sum
       - checkout
       - restore_cache:
           keys:
diff --git a/WORKSPACE b/WORKSPACE
index eca75ad9295..f214681c725 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -30,7 +30,7 @@ bind(
 )
 
 # When updating envoy sha manually please update the sha in istio.deps file also
-ENVOY_SHA = "15cfc5ad1a4d622126f642fa70699af753a2d310"
+ENVOY_SHA = "a637506da5f55f0bec37701d9e0a04f1179a6bfb"
 
 http_archive(
     name = "envoy",
diff --git a/istio.deps b/istio.deps
index 0187de51023..f48e3b6294b 100644
--- a/istio.deps
+++ b/istio.deps
@@ -11,6 +11,6 @@
 		"name": "ENVOY_SHA",
 		"repoName": "envoyproxy/envoy",
 		"file": "WORKSPACE",
-		"lastStableSHA": "15cfc5ad1a4d622126f642fa70699af753a2d310"
+		"lastStableSHA": "a637506da5f55f0bec37701d9e0a04f1179a6bfb"
 	}
 ]
diff --git a/src/envoy/http/jwt_auth/integration_test/http_filter_integration_test.cc b/src/envoy/http/jwt_auth/integration_test/http_filter_integration_test.cc
index 55bd663b95c..ad7c26b2555 100644
--- a/src/envoy/http/jwt_auth/integration_test/http_filter_integration_test.cc
+++ b/src/envoy/http/jwt_auth/integration_test/http_filter_integration_test.cc
@@ -36,18 +36,19 @@ class JwtVerificationFilterIntegrationTest
       public testing::TestWithParam<Network::Address::IpVersion> {
  public:
   JwtVerificationFilterIntegrationTest()
-      : HttpIntegrationTest(Http::CodecClient::Type::HTTP1, GetParam()) {}
+      : HttpIntegrationTest(Http::CodecClient::Type::HTTP1, GetParam(),
+                            realTime()) {}
   virtual ~JwtVerificationFilterIntegrationTest() {}
   /**
    * Initializer for an individual integration test.
    */
   void SetUp() override {
-    fake_upstreams_.emplace_back(
-        new FakeUpstream(0, FakeHttpConnection::Type::HTTP1, version_));
+    fake_upstreams_.emplace_back(new FakeUpstream(
+        0, FakeHttpConnection::Type::HTTP1, version_, timeSystem()));
     registerPort("upstream_0",
                  fake_upstreams_.back()->localAddress()->ip()->port());
-    fake_upstreams_.emplace_back(
-        new FakeUpstream(0, FakeHttpConnection::Type::HTTP1, version_));
+    fake_upstreams_.emplace_back(new FakeUpstream(
+        0, FakeHttpConnection::Type::HTTP1, version_, timeSystem()));
     registerPort("upstream_1",
                  fake_upstreams_.back()->localAddress()->ip()->port());
     createTestServer(ConfigPath(), {"http"});
diff --git a/test/integration/istio_http_integration_test.cc b/test/integration/istio_http_integration_test.cc
index 22a9e729c0d..5e169493ecb 100644
--- a/test/integration/istio_http_integration_test.cc
+++ b/test/integration/istio_http_integration_test.cc
@@ -221,12 +221,12 @@ class IstioHttpIntegrationTest : public HttpProtocolIntegrationTest {
  public:
   void createUpstreams() override {
     HttpProtocolIntegrationTest::createUpstreams();
-    fake_upstreams_.emplace_back(
-        new FakeUpstream(0, FakeHttpConnection::Type::HTTP2, version_));
+    fake_upstreams_.emplace_back(new FakeUpstream(
+        0, FakeHttpConnection::Type::HTTP2, version_, timeSystem()));
     telemetry_upstream_ = fake_upstreams_.back().get();
 
-    fake_upstreams_.emplace_back(
-        new FakeUpstream(0, FakeHttpConnection::Type::HTTP2, version_));
+    fake_upstreams_.emplace_back(new FakeUpstream(
+        0, FakeHttpConnection::Type::HTTP2, version_, timeSystem()));
     policy_upstream_ = fake_upstreams_.back().get();
   }