diff --git a/modules/electrs.nix b/modules/electrs.nix
index 76c6f09..d01d95f 100644
--- a/modules/electrs.nix
+++ b/modules/electrs.nix
@@ -74,10 +74,8 @@ in {
           > electrs.toml
         '';
       serviceConfig = nbLib.defaultHardening // {
-        RuntimeDirectory = "electrs";
-        RuntimeDirectoryMode = "700";
         # electrs only uses the working directory for reading electrs.toml
-        WorkingDirectory = "/run/electrs";
+        WorkingDirectory = cfg.dataDir;
         ExecStart = ''
           ${config.nix-bitcoin.pkgs.electrs}/bin/electrs -vv \
           --network=${bitcoind.makeNetworkName "bitcoin" "regtest"} \
diff --git a/test/tests.py b/test/tests.py
index af7cb81..d7224c4 100644
--- a/test/tests.py
+++ b/test/tests.py
@@ -375,7 +375,6 @@ def _():
     num_blocks = test_data["num_blocks"]
 
     if enabled("electrs"):
-        machine.wait_for_unit("onion-addresses")
         machine.wait_until_succeeds(log_has_string("electrs", "serving Electrum RPC"))
         get_block_height_cmd = (
             """echo '{"method": "blockchain.headers.subscribe", "id": 0, "params": []}'"""