diff --git a/BTCPayServer.Tests/docker/lnd/Dockerfile b/BTCPayServer.Tests/docker/lnd/Dockerfile
index d1e31dce7..1f95ea187 100644
--- a/BTCPayServer.Tests/docker/lnd/Dockerfile
+++ b/BTCPayServer.Tests/docker/lnd/Dockerfile
@@ -10,10 +10,10 @@ ENV GODEBUG netdns=cgo
 RUN go get -u github.com/golang/dep/cmd/dep
 
 # Grab and install the latest version of lnd and all related dependencies.
-RUN git clone https://github.com/lightningnetwork/lnd $GOPATH/src/github.com/lightningnetwork/lnd
+RUN git clone -b dev https://github.com/btcpayserver/lnd $GOPATH/src/github.com/btcpayserver/lnd
 
 # Make lnd folder default.
-WORKDIR $GOPATH/src/github.com/lightningnetwork/lnd
+WORKDIR $GOPATH/src/github.com/btcpayserver/lnd
 
 # Install dependencies and install/build lnd.
 RUN dep ensure
diff --git a/BTCPayServer.Tests/docker/lnd/start-lnd.sh b/BTCPayServer.Tests/docker/lnd/start-lnd.sh
index 711d4fed2..8ba53e4fd 100644
--- a/BTCPayServer.Tests/docker/lnd/start-lnd.sh
+++ b/BTCPayServer.Tests/docker/lnd/start-lnd.sh
@@ -49,6 +49,7 @@ CHAIN=$(set_default "$CHAIN" "bitcoin")
 BACKEND=$(set_default "$BACKEND" "bitcoind")
 
 exec lnd \
+    --no-macaroons \
     --noencryptwallet \
     --logdir="/data" \
     "--$CHAIN.active" \