diff --git a/Cargo.toml b/Cargo.toml
index 14d21c3e1..ac10ec289 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -88,8 +88,8 @@ reqwest-default-tls = ["reqwest/default-tls"]
 
 # Debug/Test features
 test-blockchains = ["bitcoincore-rpc", "electrum-client"]
-test-electrum = ["electrum", "electrsd/electrs_0_8_10", "test-blockchains"]
-test-rpc = ["rpc", "electrsd/electrs_0_8_10", "test-blockchains"]
+test-electrum = ["electrum", "electrsd/electrs_0_9_1", "test-blockchains"]
+test-rpc = ["rpc", "electrsd/electrs_0_9_1", "test-blockchains"]
 test-esplora = ["electrsd/legacy", "electrsd/esplora_a33e97e1", "test-blockchains"]
 test-md-docs = ["electrum"]
 
@@ -97,7 +97,7 @@ test-md-docs = ["electrum"]
 lazy_static = "1.4"
 env_logger = "0.7"
 clap = "2.33"
-electrsd = { version= "0.19.1", features = ["bitcoind_22_0"] }
+electrsd = { version= "0.19.1", features = ["bitcoind_23_0"] }
 
 [[example]]
 name = "address_validator"
diff --git a/src/blockchain/rpc.rs b/src/blockchain/rpc.rs
index 7eb059204..aee0360e9 100644
--- a/src/blockchain/rpc.rs
+++ b/src/blockchain/rpc.rs
@@ -378,7 +378,22 @@ impl ConfigurableBlockchain for RpcBlockchain {
                 client.load_wallet(&wallet_name)?;
                 debug!("wallet loaded {:?}", wallet_name);
             } else {
-                client.create_wallet(&wallet_name, Some(true), None, None, None)?;
+                // this call doesn't work with core v0.23.0
+                //client.create_wallet(&wallet_name, Some(true), None, None, None)?;
+                {
+                    // TODO: move back to api call when https://github.com/rust-bitcoin/rust-bitcoincore-rpc/issues/225 is fixed
+                    let args = [
+                        Value::String(wallet_name.clone()),
+                        Value::Bool(true),
+                        Value::Bool(false),
+                        Value::Null,
+                        Value::Bool(false),
+                        Value::Bool(false),
+                        Value::Bool(false),
+                        Value::Bool(false),
+                    ];
+                    let _: Value = client.call("createwallet", &args)?;
+                }
                 debug!("wallet created {:?}", wallet_name);
             }
         }
diff --git a/src/testutils/blockchain_tests.rs b/src/testutils/blockchain_tests.rs
index 556d98f64..56d8307e9 100644
--- a/src/testutils/blockchain_tests.rs
+++ b/src/testutils/blockchain_tests.rs
@@ -27,6 +27,7 @@ impl TestClient {
 
         let mut conf = bitcoind::Conf::default();
         conf.view_stdout = log_enabled!(Level::Debug);
+        conf.p2p = bitcoind::P2P::Yes;
         let bitcoind = BitcoinD::with_conf(bitcoind_exe, &conf).unwrap();
 
         let mut conf = electrsd::Conf::default();