diff --git a/Cargo.toml b/Cargo.toml
index c45025eb6f..9eb4f3637e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,13 +23,12 @@ secp-recovery = ["secp256k1/recovery"]
 
 # either std or no-std must be selected
 std = ["secp256k1/std", "bitcoin_hashes/std", "bech32/std"]
-no-std = ["hashbrown/nightly", "core2/alloc"]
+no-std = ["hashbrown/nightly", "core2/alloc", "bitcoin_hashes/no-std"]
 
 compact-block-filters = ["hashbrown"]
 merkleblock = ["hashbrown"]
 
 [dependencies]
-bitcoin_hashes = { version = "0.9.6", default-features = false }
 secp256k1 = { version = "0.20.2", default-features = false }
 core2 = { version = "0.3.0-alpha.1", optional = true, default_features = false }
 
@@ -42,8 +41,12 @@ hashbrown = { version = "0.1.8", optional = true }
 git = "https://github.com/rust-bitcoin/rust-bech32.git"
 default-features = false
 
+[dependencies.bitcoin_hashes]
+git = "https://github.com/devrandom/bitcoin_hashes.git"
+default-features = false
+rev = "b80cd7af0f765d5a226473471f6626421cbaf7ff"
+
 [dev-dependencies]
-bitcoin_hashes = { version = "0.9.6" }  # need std for test hex handling
 serde_json = "<1.0.45"
 serde_test = "1"
 secp256k1 = { version = "0.20.0", features = [ "recovery", "rand-std" ] }
@@ -51,6 +54,10 @@ bincode = "1.3.1"
 # We need to pin ryu (transitive dep from serde_json) to stay compatible with Rust 1.22.0
 ryu = "<1.0.5"
 
+[dev-dependencies.bitcoin_hashes]
+git = "https://github.com/devrandom/bitcoin_hashes.git"
+rev = "b80cd7af0f765d5a226473471f6626421cbaf7ff"
+
 [[example]]
 name = "bip32"