diff --git a/fuzz/oss-fuzz-build.sh b/fuzz/oss-fuzz-build.sh
index 027357d34a..ddf00e83cc 100644
--- a/fuzz/oss-fuzz-build.sh
+++ b/fuzz/oss-fuzz-build.sh
@@ -20,8 +20,7 @@ build_go_fuzzer FuzzCryptoHDNewParamsFromPath fuzz_crypto_hd_newparamsfrompath
 
 build_go_fuzzer FuzzCryptoTypesCompactbitarrayMarshalUnmarshal fuzz_crypto_types_compactbitarray_marshalunmarshal
 
-# TODO: update test and re-enable.
-#build_go_fuzzer FuzzStoreInternalProofsCreateNonmembershipProof fuzz_store_internal_proofs_createnonmembershipproof
+build_go_fuzzer FuzzStoreInternalProofsCreateNonmembershipProof fuzz_store_internal_proofs_createnonmembershipproof
 
 build_go_fuzzer FuzzTendermintAminoDecodeTime fuzz_tendermint_amino_decodetime
 
diff --git a/fuzz/tests/store_internal_proofs_createnonmembershipproof_test.go b/fuzz/tests/store_internal_proofs_createnonmembershipproof_test.go
index cd6c58a014..acd47a1fa4 100644
--- a/fuzz/tests/store_internal_proofs_createnonmembershipproof_test.go
+++ b/fuzz/tests/store_internal_proofs_createnonmembershipproof_test.go
@@ -2,13 +2,13 @@
 
 package tests
 
-/*
-// TODO: Retrofit to the right parameters for CreateNonmembershipProof
 import (
 	"encoding/json"
 	"testing"
 
 	iavlproofs "github.com/cosmos/cosmos-sdk/store/tools/ics23/iavl"
+	"github.com/cosmos/iavl"
+	db "github.com/tendermint/tm-db"
 )
 
 type serialize struct {
@@ -25,7 +25,14 @@ func FuzzStoreInternalProofsCreateNonmembershipProof(f *testing.F) {
 		if len(sz.Data) == 0 || len(sz.Key) == 0 {
 			return
 		}
-		icp, err := iavlproofs.CreateNonMembershipProof(sz.Data, []byte(sz.Key))
+		tree, err := iavl.NewMutableTree(db.NewMemDB(), 0)
+		if err != nil {
+			t.Fatal(err)
+		}
+		for k, v := range sz.Data {
+			tree.Set([]byte(k), v)
+		}
+		icp, err := iavlproofs.CreateNonMembershipProof(tree, []byte(sz.Key))
 		if err != nil {
 			return
 		}
@@ -34,4 +41,3 @@ func FuzzStoreInternalProofsCreateNonmembershipProof(f *testing.F) {
 		}
 	})
 }
-*/
diff --git a/go.mod b/go.mod
index 29d0ca8666..6cc1ea69d0 100644
--- a/go.mod
+++ b/go.mod
@@ -63,7 +63,10 @@ require (
 	sigs.k8s.io/yaml v1.3.0
 )
 
-require github.com/cosmos/cosmos-sdk/depinject v1.0.0-alpha.4
+require (
+	github.com/cosmos/cosmos-sdk/depinject v1.0.0-alpha.4
+	github.com/cosmos/cosmos-sdk/store/tools/ics23 v0.0.0-20220608170201-b0e82f964070
+)
 
 require (
 	cloud.google.com/go v0.100.2 // indirect
diff --git a/go.sum b/go.sum
index 0db6152806..639ac05786 100644
--- a/go.sum
+++ b/go.sum
@@ -292,6 +292,8 @@ github.com/cosmos/btcutil v1.0.4 h1:n7C2ngKXo7UC9gNyMNLbzqz7Asuf+7Qv4gnX/rOdQ44=
 github.com/cosmos/btcutil v1.0.4/go.mod h1:Ffqc8Hn6TJUdDgHBwIZLtrLQC1KdJ9jGJl/TvgUaxbU=
 github.com/cosmos/cosmos-proto v1.0.0-alpha7 h1:yqYUOHF2jopwZh4dVQp3xgqwftE5/2hkrwIV6vkUbO0=
 github.com/cosmos/cosmos-proto v1.0.0-alpha7/go.mod h1:dosO4pSAbJF8zWCzCoTWP7nNsjcvSUBQmniFxDg5daw=
+github.com/cosmos/cosmos-sdk/store/tools/ics23 v0.0.0-20220608170201-b0e82f964070 h1:mNkbj6wAz/m0q04ZWk/qlnyCxVYQATRqjINQfdOf07I=
+github.com/cosmos/cosmos-sdk/store/tools/ics23 v0.0.0-20220608170201-b0e82f964070/go.mod h1:EOXK+a/6yV5rT46k8UaI56UwE+AU1uq712wy6IbG5+E=
 github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
 github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
 github.com/cosmos/iavl v0.18.0 h1:02ur4vnalMR2GuWCFNkuseUcl/BCVmg9tOeHOGiZOkE=