diff --git a/.github/workflows/cont_integration.yml b/.github/workflows/cont_integration.yml
index 3a92f052a6..42fb4ce493 100644
--- a/.github/workflows/cont_integration.yml
+++ b/.github/workflows/cont_integration.yml
@@ -22,6 +22,7 @@ jobs:
           - compact_filters
           - esplora,key-value-db,electrum
           - compiler
+          - rpc
     steps:
       - name: checkout
         uses: actions/checkout@v2
@@ -108,6 +109,19 @@ jobs:
       - name: Test
         run: $HOME/.cargo/bin/cargo test --features test-electrum --no-default-features
 
+  test-rpc:
+    name: Test rpc
+    runs-on: ubuntu-20.04
+    env:
+      BITCOIN_VER: 0.21.0
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - run: echo "BITCOIND_EXE=${{ github.workspace }}/bitcoin-${{ env.BITCOIN_VER }}/bin/bitcoind" >> $GITHUB_ENV
+      - run: curl https://bitcoincore.org/bin/bitcoin-core-$BITCOIN_VER/bitcoin-$BITCOIN_VER-x86_64-linux-gnu.tar.gz | tar -xvz bitcoin-$BITCOIN_VER/bin/bitcoind
+      - name: Test
+        run: $HOME/.cargo/bin/cargo test --features test-electrum --no-default-features
+
   check-wasm:
     name: Check WASM
     runs-on: ubuntu-16.04
diff --git a/Cargo.toml b/Cargo.toml
index e11af32ff5..7386ab37e3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -59,6 +59,7 @@ rpc = ["bitcoincore-rpc"]
 # Debug/Test features
 debug-proc-macros = ["bdk-macros/debug", "bdk-testutils-macros/debug"]
 test-electrum = ["electrum"]
+test-rpc = ["rpc"]
 test-md-docs = ["electrum"]
 
 [dev-dependencies]
diff --git a/src/blockchain/rpc.rs b/src/blockchain/rpc.rs
index b64015038d..4614c09d6c 100644
--- a/src/blockchain/rpc.rs
+++ b/src/blockchain/rpc.rs
@@ -314,6 +314,7 @@ fn list_wallet_dir(client: &Client) -> Result<Vec<String>, Error> {
     Ok(result.wallets.into_iter().map(|n| n.name).collect())
 }
 
+#[cfg(feature = "test-rpc")]
 #[cfg(test)]
 mod test {
     use super::{RpcBlockchain, RpcConfig};
diff --git a/src/error.rs b/src/error.rs
index 7fb9bea8f5..24f78b1f40 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -88,7 +88,7 @@ pub enum Error {
         /// requested network, for example what is given as bdk-cli option
         requested: Network,
         /// found network, for example the network of the bitcoin node
-        found: Network
+        found: Network,
     },
     /// Progress value must be between `0.0` (included) and `100.0` (included)
     InvalidProgressValue(f32),