diff --git a/configure-box.sh b/configure-box.sh
index 0560515..8930fb0 100755
--- a/configure-box.sh
+++ b/configure-box.sh
@@ -30,10 +30,11 @@ sed -i "s/RPCPASS/${RPCPASS}/g; " docker-compose.yml
 if [ ! -z $TESTNET ]; then
     echo "Enabling testnet mode if TESTNET variable is set"
     # Update bitcoin.conf
-    sed -i '/[test]/s/^#//g' bitcoin/bitcoin.conf 
-    sed -i '/testnet=1/s/^#//g' bitcoin/bitcoin.conf
+    sed -i 's/#[test]/[test]/g;' bitcoin/bitcoin.conf 
+    sed -i 's/#testnet=1/testnet=1/g' bitcoin/bitcoin.conf
     # Update docker-compose
     sed -i 's/mainnet/testnet/g; ' docker-compose.yml
+    # TODO: lnd.conf
 fi
 echo "Adding tor password"
 SAVE_PASSWORD=`tor --hash-password "${RPCPASS}"`