diff --git a/BTCPayServer.Tests/README.md b/BTCPayServer.Tests/README.md
index 4b65f03a4..7b5b47c6b 100644
--- a/BTCPayServer.Tests/README.md
+++ b/BTCPayServer.Tests/README.md
@@ -41,7 +41,7 @@ docker-compose run --rm tests
 
 You can call bitcoin-cli inside the container with `docker exec`, for example, if you want to send `0.23111090` to `mohu16LH66ptoWGEL1GtP6KHTBJYXMWhEf`:
 ```
-docker exec -ti btcpayserver_dev_bitcoind bitcoin-cli -regtest -conf="/data/bitcoin.conf" -datadir="/data" sendtoaddress "mohu16LH66ptoWGEL1GtP6KHTBJYXMWhEf" 0.23111090
+docker exec -ti btcpayservertests_bitcoind_1 bitcoin-cli -regtest -conf="/data/bitcoin.conf" -datadir="/data" sendtoaddress "mohu16LH66ptoWGEL1GtP6KHTBJYXMWhEf" 0.23111090
 ```
 
 If you are using Powershell:
diff --git a/BTCPayServer.Tests/docker-bitcoin-cli.ps1 b/BTCPayServer.Tests/docker-bitcoin-cli.ps1
index 6516d1011..7f1cac7c1 100644
--- a/BTCPayServer.Tests/docker-bitcoin-cli.ps1
+++ b/BTCPayServer.Tests/docker-bitcoin-cli.ps1
@@ -1 +1 @@
-docker exec -ti btcpayserver_dev_bitcoind bitcoin-cli -regtest -conf="/data/bitcoin.conf" -datadir="/data" $args
\ No newline at end of file
+docker exec -ti btcpayservertests_bitcoind_1 bitcoin-cli -regtest -conf="/data/bitcoin.conf" -datadir="/data" $args
diff --git a/BTCPayServer.Tests/docker-compose.yml b/BTCPayServer.Tests/docker-compose.yml
index 7672bbec9..810bf3c86 100644
--- a/BTCPayServer.Tests/docker-compose.yml
+++ b/BTCPayServer.Tests/docker-compose.yml
@@ -65,7 +65,6 @@ services:
       - litecoind
 
   bitcoind:
-    container_name: btcpayserver_dev_bitcoind
     image: nicolasdorier/docker-bitcoin:0.16.0
     environment:
       BITCOIN_EXTRA_ARGS: |
@@ -143,7 +142,6 @@ services:
       - bitcoind
 
   litecoind:
-    container_name: btcpayserver_dev_litecoind
     image: nicolasdorier/docker-litecoin:0.14.2
     environment:
       BITCOIN_EXTRA_ARGS: |
diff --git a/BTCPayServer.Tests/docker-litecoin-cli.ps1 b/BTCPayServer.Tests/docker-litecoin-cli.ps1
index 8e3038a95..cfd0801d2 100644
--- a/BTCPayServer.Tests/docker-litecoin-cli.ps1
+++ b/BTCPayServer.Tests/docker-litecoin-cli.ps1
@@ -1 +1 @@
-docker exec -ti btcpayserver_dev_litecoind litecoin-cli -regtest -conf="/data/litecoin.conf" -datadir="/data" $args
+docker exec -ti btcpayservertests_litecoind_1 litecoin-cli -regtest -conf="/data/litecoin.conf" -datadir="/data" $args