diff --git a/.travis.yml b/.travis.yml
index 23799ea3..fb9c8321 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,8 @@ jobs:
       env: BITCOINVERSION=0.20.1
     - rust: stable
       env: BITCOINVERSION=0.21.0
+    - rust: stable
+      env: BITCOINVERSION=22.0
 
 script:
   - ./contrib/test.sh
diff --git a/README.md b/README.md
index c7517e74..e50d2071 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,7 @@ The following versions are officially supported and automatically tested:
 * 0.20.0
 * 0.20.1
 * 0.21.0
+* 22.0
 
 # Minimum Supported Rust Version (MSRV)
 This library should always compile with any combination of features on **Rust 1.29**.
diff --git a/integration_test/run.sh b/integration_test/run.sh
index b40aa78a..2c6c42a3 100755
--- a/integration_test/run.sh
+++ b/integration_test/run.sh
@@ -19,12 +19,12 @@ PID1=$!
 sleep 3
 
 BLOCKFILTERARG=""
-if bitcoind -version | grep -q "v0\.\(19\|2\)"; then
+if bitcoind -version | grep -q "v\(0\.19\|0\.2\|2\)"; then
     BLOCKFILTERARG="-blockfilterindex=1"
 fi
 
 FALLBACKFEEARG=""
-if bitcoind -version | grep -q "v0\.2"; then
+if bitcoind -version | grep -q "v\(0\.2\|2\)"; then
     FALLBACKFEEARG="-fallbackfee=0.00001000"
 fi
 
diff --git a/json/src/lib.rs b/json/src/lib.rs
index 80dd4581..45ac9d11 100644
--- a/json/src/lib.rs
+++ b/json/src/lib.rs
@@ -1066,11 +1066,13 @@ pub struct GetPeerInfoResult {
 }
 
 #[derive(Copy, Serialize, Deserialize, Clone, PartialEq, Eq, Debug)]
-#[serde(rename_all = "lowercase")]
+#[serde(rename_all = "snake_case")]
 pub enum GetPeerInfoResultNetwork {
     Ipv4,
     Ipv6,
     Onion,
+    I2p,
+    NotPubliclyRoutable,
     // this is undocumented upstream
     Unroutable,
 }