diff --git a/Cargo.lock b/Cargo.lock
index 1f2c2f84..17ad679a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -51,9 +51,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitvec"
-version = "0.20.4"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848"
+checksum = "5237f00a8c86130a0cc317830e558b966dd7850d48a953d998c813f01a41b527"
 dependencies = [
  "funty",
  "radium",
@@ -252,9 +252,9 @@ dependencies = [
 
 [[package]]
 name = "funty"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
+checksum = "1847abb9cb65d566acd5942e94aea9c8f547ad02c98e1649326fc0e8910b8b1e"
 
 [[package]]
 name = "generic-array"
@@ -886,6 +886,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "wyz"
-version = "0.2.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
+checksum = "129e027ad65ce1453680623c3fb5163cbf7107bfe1aa32257e7d0e63f9ced188"
+dependencies = [
+ "tap",
+]
diff --git a/Cargo.toml b/Cargo.toml
index 264f3fd1..245bf761 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@ edition = "2018"
 arrayvec = { version = "0.7", default-features = false }
 serde = { version = "1.0.102", optional = true }
 parity-scale-codec-derive = { path = "derive", version = "2.3.1", default-features = false, optional = true }
-bitvec = { version = "0.20.1", default-features = false, features = ["alloc"], optional = true }
+bitvec = { version = "0.22.3", default-features = false, features = ["alloc"], optional = true }
 byte-slice-cast = { version = "1.0.0", default-features = false }
 generic-array = { version = "0.14.4", optional = true }
 arbitrary = { version = "1.0.1", features = ["derive"], optional = true }
diff --git a/fuzzer/Cargo.toml b/fuzzer/Cargo.toml
index f2ba7415..57569921 100644
--- a/fuzzer/Cargo.toml
+++ b/fuzzer/Cargo.toml
@@ -9,4 +9,4 @@ publish = false
 parity-scale-codec = { path = "..", features = ["derive", "bit-vec", "fuzz"] }
 honggfuzz = "0.5.54"
 arbitrary = { version = "1.0.1", features = ["derive"] }
-bitvec = { version = "0.20.1", features = ["alloc"] }
+bitvec = { version = "0.22.3", features = ["alloc"] }
diff --git a/src/bit_vec.rs b/src/bit_vec.rs
index 35d3123f..95645966 100644
--- a/src/bit_vec.rs
+++ b/src/bit_vec.rs
@@ -15,7 +15,8 @@
 //! `BitVec` specific serialization.
 
 use bitvec::{
-	vec::BitVec, store::BitStore, order::BitOrder, slice::BitSlice, boxed::BitBox, mem::BitMemory
+	boxed::BitBox, order::BitOrder, slice::BitSlice, store::BitStore, vec::BitVec,
+	view::BitViewSized,
 };
 use crate::{
 	EncodeLike, Encode, Decode, Input, Output, Error, Compact,
@@ -31,11 +32,11 @@ impl<O: BitOrder, T: BitStore + Encode> Encode for BitSlice<O, T> {
 		);
 		Compact(len as u32).encode_to(dest);
 
-		// NOTE: doc of `BitSlice::as_slice`:
+		// NOTE: doc of `BitSlice::as_raw_slice`:
 		// > The returned slice handle views all elements touched by self
 		//
 		// Thus we are sure the slice doesn't contain unused elements at the end.
-		let slice = self.as_slice();
+		let slice = self.as_raw_slice();
 
 		encode_slice_no_len(slice, dest)
 	}
@@ -97,7 +98,7 @@ impl<O: BitOrder, T: BitStore + Decode> Decode for BitBox<O, T> {
 /// NOTE: this should never happen if `bits` is already checked to be less than
 /// `BitStore::MAX_BITS`.
 fn required_elements<T: BitStore>(bits: u32) -> Result<u32, Error> {
-	let element_bits = T::Mem::BITS as u32;
+	let element_bits = T::BITS as u32;
 	let error = Error::from("Attempt to decode bitvec with too many bits");
 	Ok((bits.checked_add(element_bits).ok_or_else(|| error)?  - 1) / element_bits)
 }
@@ -170,6 +171,10 @@ mod tests {
 	}
 
 	#[test]
+	// Flaky test due to:
+	// * https://github.com/bitvecto-rs/bitvec/issues/135
+	// * https://github.com/rust-lang/miri/issues/1866
+	#[cfg(not(miri))]
 	fn bitvec_u8() {
 		for v in &test_data!(u8) {
 			let encoded = v.encode();
@@ -182,7 +187,6 @@ mod tests {
 	// * https://github.com/bitvecto-rs/bitvec/issues/135
 	// * https://github.com/rust-lang/miri/issues/1866
 	#[cfg(not(miri))]
-
 	fn bitvec_u16() {
 		for v in &test_data!(u16) {
 			let encoded = v.encode();