diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
index d9127ffbea321..98d40cd28bd36 100644
--- a/bazel/repository_locations.bzl
+++ b/bazel/repository_locations.bzl
@@ -948,8 +948,8 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "WebAssembly for Proxies (C++ host implementation)",
         project_desc = "WebAssembly for Proxies (C++ host implementation)",
         project_url = "https://github.com/proxy-wasm/proxy-wasm-cpp-host",
-        version = "aba2704bcd7d8adce2ccaf07c4ecbaf0cffeb7ef",
-        sha256 = "6263b45f87fc0c106eb88f31238553b1bde68f8a5ea25e20e95a5e6624a896d2",
+        version = "4b33df7638637fcc680291daa9d7a57c59e0411e",
+        sha256 = "e78507e04dc8b154ced5b19d6175bd1435fd850fdd127bce541d31799db06cd4",
         strip_prefix = "proxy-wasm-cpp-host-{version}",
         urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-host/archive/{version}.tar.gz"],
         use_category = ["dataplane_ext"],
@@ -964,7 +964,7 @@ REPOSITORY_LOCATIONS_SPEC = dict(
             "envoy.wasm.runtime.wavm",
             "envoy.wasm.runtime.wasmtime",
         ],
-        release_date = "2021-04-08",
+        release_date = "2021-04-20",
         cpe = "N/A",
     ),
     proxy_wasm_rust_sdk = dict(
diff --git a/test/extensions/common/wasm/wasm_vm_test.cc b/test/extensions/common/wasm/wasm_vm_test.cc
index 43f6f0ac927cf..46edd6dfe3ca2 100644
--- a/test/extensions/common/wasm/wasm_vm_test.cc
+++ b/test/extensions/common/wasm/wasm_vm_test.cc
@@ -60,7 +60,6 @@ TEST_F(BaseVmTest, NullVmStartup) {
   EXPECT_TRUE(wasm_vm->cloneable() == Cloneable::InstantiatedModule);
   auto wasm_vm_clone = wasm_vm->clone();
   EXPECT_TRUE(wasm_vm_clone != nullptr);
-  EXPECT_TRUE(wasm_vm->getCustomSection("user").empty());
   EXPECT_EQ(wasm_vm->runtime(), "null");
   std::function<void()> f;
   EXPECT_FALSE(wasm_vm->integration()->getNullVmFunction("bad_function", false, 0, nullptr, &f));
@@ -149,12 +148,6 @@ TEST_P(WasmVmTest, V8Code) {
       "{{ test_rundir }}/test/extensions/common/wasm/test_data/test_rust.wasm"));
   EXPECT_TRUE(wasm_vm->load(code, GetParam()));
 
-  // Sanity checks for the expected test file.
-  if (!wasm_vm->getPrecompiledSectionName().empty()) {
-    EXPECT_TRUE(!wasm_vm->getCustomSection(wasm_vm->getPrecompiledSectionName()).empty());
-  }
-  EXPECT_THAT(wasm_vm->getCustomSection("producers"), HasSubstr("rustc"));
-
   EXPECT_TRUE(wasm_vm->cloneable() == Cloneable::CompiledBytecode);
   EXPECT_TRUE(wasm_vm->clone() != nullptr);
 }
diff --git a/test/extensions/filters/http/wasm/config_test.cc b/test/extensions/filters/http/wasm/config_test.cc
index 46c3741c55a69..e80d77ec98928 100644
--- a/test/extensions/filters/http/wasm/config_test.cc
+++ b/test/extensions/filters/http/wasm/config_test.cc
@@ -840,7 +840,8 @@ TEST_P(WasmFilterConfigTest, YamlLoadFromRemoteSuccessBadcode) {
   EXPECT_CALL(stream_info, setResponseCodeDetails("wasm_fail_stream"));
   EXPECT_CALL(decoder_callbacks, resetStream());
 
-  EXPECT_EQ(context->onRequestHeaders(10, false), proxy_wasm::FilterHeadersStatus::StopIteration);
+  EXPECT_EQ(context->onRequestHeaders(10, false),
+            proxy_wasm::FilterHeadersStatus::StopAllIterationAndWatermark);
 }
 
 TEST_P(WasmFilterConfigTest, YamlLoadFromRemoteSuccessBadcodeFailOpen) {