diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml
index 9738b325..a41a1bdf 100644
--- a/.github/workflows/rust.yaml
+++ b/.github/workflows/rust.yaml
@@ -174,10 +174,10 @@ jobs:
     strategy:
       matrix:
         features:
-          - bitcoind_22_1,electrs_0_8_10
-          - bitcoind_22_1,electrs_0_9_1
-          - bitcoind_22_1,electrs_0_9_11
-          - bitcoind_22_1,electrs_0_10_6
+          - bitcoind_22_1,bitcoind_download,electrs_0_8_10
+          - bitcoind_22_1,bitcoind_download,electrs_0_9_1
+          - bitcoind_22_1,bitcoind_download,electrs_0_9_11
+          - bitcoind_22_1,bitcoind_download,electrs_0_10_6
       fail-fast: false
 
     steps:
@@ -194,7 +194,7 @@ jobs:
       CARGO_TERM_COLOR: always
     strategy:
       matrix:
-        features: ["bitcoind_22_1,legacy,esplora_a33e97e1"]
+        features: ["bitcoind_22_1,bitcoind_download,legacy,esplora_a33e97e1"]
 
     steps:
       - uses: actions/checkout@v3
@@ -236,4 +236,4 @@ jobs:
       - name: Checkout Crate
         uses: actions/checkout@v3
       - uses: Swatinem/rust-cache@v2
-      - run: cd electrsd && cargo test --features 'bitcoind_25_2'
+      - run: cd electrsd && cargo test --features 'bitcoind_25_2,bitcoind_download'
diff --git a/electrsd/Cargo.toml b/electrsd/Cargo.toml
index 4db55257..ef6d1032 100644
--- a/electrsd/Cargo.toml
+++ b/electrsd/Cargo.toml
@@ -45,17 +45,19 @@ electrs_0_9_1 = ["download"]
 electrs_0_9_11 = ["download"]
 electrs_0_10_6 = ["download"]
 
-bitcoind_30_2 = ["bitcoind/download", "bitcoind/30_2"]
-bitcoind_29_0 = ["bitcoind/download", "bitcoind/29_0"]
-bitcoind_28_2 = ["bitcoind/download", "bitcoind/28_2"]
-bitcoind_27_2 = ["bitcoind/download", "bitcoind/27_2"]
-bitcoind_26_2 = ["bitcoind/download", "bitcoind/26_2"]
-bitcoind_25_2 = ["bitcoind/download", "bitcoind/25_2"]
-bitcoind_24_2 = ["bitcoind/download", "bitcoind/24_2"]
-bitcoind_23_1 = ["bitcoind/download", "bitcoind/23_2"]
-bitcoind_22_1 = ["bitcoind/download", "bitcoind/22_1"]
-bitcoind_0_21_2 = ["bitcoind/download", "bitcoind/0_21_2"]
-bitcoind_0_20_2 = ["bitcoind/download", "bitcoind/0_20_2"]
-bitcoind_0_19_1 = ["bitcoind/download", "bitcoind/0_19_1"]
-bitcoind_0_18_1 = ["bitcoind/download", "bitcoind/0_18_1"]
-bitcoind_0_17_2 = ["bitcoind/download", "bitcoind/0_17_2"]
+bitcoind_download = ["bitcoind/download", "download"]
+
+bitcoind_30_2 = ["bitcoind/30_2"]
+bitcoind_29_0 = ["bitcoind/29_0"]
+bitcoind_28_2 = ["bitcoind/28_2"]
+bitcoind_27_2 = ["bitcoind/27_2"]
+bitcoind_26_2 = ["bitcoind/26_2"]
+bitcoind_25_2 = ["bitcoind/25_2"]
+bitcoind_24_2 = ["bitcoind/24_2"]
+bitcoind_23_1 = ["bitcoind/23_2"]
+bitcoind_22_1 = ["bitcoind/22_1"]
+bitcoind_0_21_2 = ["bitcoind/0_21_2"]
+bitcoind_0_20_2 = ["bitcoind/0_20_2"]
+bitcoind_0_19_1 = ["bitcoind/0_19_1"]
+bitcoind_0_18_1 = ["bitcoind/0_18_1"]
+bitcoind_0_17_2 = ["bitcoind/0_17_2"]