diff --git a/BTCPayServer.Tests/ServerTester.cs b/BTCPayServer.Tests/ServerTester.cs
index 4fa4b982e..7b7255ff5 100644
--- a/BTCPayServer.Tests/ServerTester.cs
+++ b/BTCPayServer.Tests/ServerTester.cs
@@ -93,11 +93,6 @@ namespace BTCPayServer.Tests
             var clightning = new NodeInfo(info.Id, MerchantCharge.P2PHost, info.Port);
             var connect = CustomerEclair.RPC.ConnectAsync(clightning);
             await Task.WhenAll(blockCount, customer, channels, connect);
-            // Mine until segwit is activated
-            if (blockCount.Result <= 432)
-            {
-                ExplorerNode.Generate(433 - blockCount.Result);
-            }
 
             // If the channel is not created, let's do it
             if (channels.Result.Length == 0)
diff --git a/BTCPayServer.Tests/docker-compose.yml b/BTCPayServer.Tests/docker-compose.yml
index 996ccb244..76f5448db 100644
--- a/BTCPayServer.Tests/docker-compose.yml
+++ b/BTCPayServer.Tests/docker-compose.yml
@@ -28,7 +28,7 @@ services:
 
   # The dev container is not actually used, it is just handy to run `docker-compose up dev` to start all services
   dev: 
-    image: nicolasdorier/docker-bitcoin:0.15.0.1
+    image: nicolasdorier/docker-bitcoin:0.16.0
     environment:
       BITCOIN_EXTRA_ARGS: |
         regtest=1
@@ -40,7 +40,7 @@ services:
       - lightning-charged
 
   nbxplorer:
-    image: nicolasdorier/nbxplorer:1.0.1.14
+    image: nicolasdorier/nbxplorer:1.0.1.16
     ports:
       - "32838:32838"
     expose: 
@@ -65,7 +65,7 @@ services:
 
   bitcoind:
     container_name: btcpayserver_dev_bitcoind
-    image: nicolasdorier/docker-bitcoin:0.15.0.1
+    image: nicolasdorier/docker-bitcoin:0.16.0
     environment:
       BITCOIN_EXTRA_ARGS: |
         rpcuser=ceiwHEbqWI83
@@ -78,6 +78,8 @@ services:
         zmqpubrawblock=tcp://0.0.0.0:29000
         zmqpubrawtx=tcp://0.0.0.0:29000
         txindex=1
+        # Eclair is still using addwitnessaddress
+        deprecatedrpc=addwitnessaddress 
     ports: 
       - "43782:43782"
     expose: