diff --git a/bazel/external/wavm.patch b/bazel/external/wavm.patch
deleted file mode 100644
index a03c67c32..000000000
--- a/bazel/external/wavm.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Fix build with Clang 13. (https://github.com/WAVM/WAVM/pull/332)
-
-diff --git a/Lib/Platform/POSIX/ThreadPOSIX.cpp b/Lib/Platform/POSIX/ThreadPOSIX.cpp
-index e1f232f6..d3241349 100644
---- a/Lib/Platform/POSIX/ThreadPOSIX.cpp
-+++ b/Lib/Platform/POSIX/ThreadPOSIX.cpp
-@@ -173,6 +173,7 @@ WAVM_NO_ASAN static void touchStackPages(U8* minAddr, Uptr numBytesPerPage)
- 		sum += *touchAddr;
- 		if(touchAddr < minAddr + numBytesPerPage) { break; }
- 	}
-+	WAVM_SUPPRESS_UNUSED(sum);
- }
- 
- bool Platform::initThreadAndGlobalSignalsOnce()
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index c9b8e6a0f..af8d5c8b6 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -233,11 +233,9 @@ def proxy_wasm_cpp_host_repositories():
         http_archive,
         name = "com_github_wavm_wavm",
         build_file = "@proxy_wasm_cpp_host//bazel/external:wavm.BUILD",
-        sha256 = "bf2b2aec8a4c6a5413081c0527cb40dd16cb67e9c74a91f8a82fe1cf27a3c5d5",
-        strip_prefix = "WAVM-c8997ebf154f3b42e688e670a7d0fa045b7a32a0",
-        url = "https://github.com/WAVM/WAVM/archive/c8997ebf154f3b42e688e670a7d0fa045b7a32a0.tar.gz",
-        patches = ["@proxy_wasm_cpp_host//bazel/external:wavm.patch"],
-        patch_args = ["-p1"],
+        sha256 = "7cfa3d7334c96f89553bb44eeee736a192826a78b4db114042d38d6882748f5b",
+        strip_prefix = "WAVM-nightly-2022-05-14",
+        url = "https://github.com/WAVM/WAVM/archive/refs/tags/nightly/2022-05-14.tar.gz",
     )
 
     native.bind(
diff --git a/test/runtime_test.cc b/test/runtime_test.cc
index 2d178466a..d0f6fd0af 100644
--- a/test/runtime_test.cc
+++ b/test/runtime_test.cc
@@ -165,12 +165,6 @@ TEST_P(TestVm, Trap) {
 }
 
 TEST_P(TestVm, Trap2) {
-  if (engine_ == "wavm") {
-    // TODO(mathetake): Somehow WAVM exits with 'munmap_chunk(): invalid pointer' on unidentified
-    // build condition in 'libstdc++ abi::__cxa_demangle' originally from
-    // WAVM::Runtime::describeCallStack. Needs further investigation.
-    return;
-  }
   auto source = readTestWasmFile("trap.wasm");
   ASSERT_FALSE(source.empty());
   auto wasm = TestWasm(std::move(vm_));