diff --git a/dex/testing/firo/electrum.sh b/dex/testing/firo/electrum.sh
index 9c68666d9c..adf5a4794c 100755
--- a/dex/testing/firo/electrum.sh
+++ b/dex/testing/firo/electrum.sh
@@ -33,10 +33,12 @@ ELECTRUM_DIR=${ASSET_DIR}/client
 REPO_DIR=${ELECTRUM_DIR}/electrum-repo
 WALLET_DIR=${ELECTRUM_DIR}/wallet
 NET_DIR=${WALLET_DIR}/regtest
+HARNESS_DIR=~/dextest/firo/harness-ctl
 
 # startup options
 # CLI, DAEMON, GUI  (Default start as CLI)
-STARTUP=CLI
+# To change the mode, run with e.g.
+#   STARTUP=DAEMON ./electrum.sh
 ELECTRUM_REGTEST_ARGS="--regtest --dir=${WALLET_DIR}"
 WALLET_PASSWORD="abc"
 
@@ -54,8 +56,11 @@ fi
 
 git remote -v
 
-git fetch --depth 1 origin ${COMMIT}
-git reset --hard FETCH_HEAD
+CURRENT_COMMIT=$(git rev-parse HEAD)
+if [ ! "${CURRENT_COMMIT}" == "${COMMIT}" ]; then
+    git fetch --depth 1 origin ${COMMIT}
+    git reset --hard FETCH_HEAD
+fi
 
 if [ ! -d "${ELECTRUM_DIR}/venv" ]; then
     # The venv interpreter will be this python version, e.g. python3.10
@@ -110,6 +115,13 @@ rpcpassword=pass
 rpcbind=127.0.0.1:${RPCPORT}
 EOF
 
+cat > "${HARNESS_DIR}/electrum-cli" <<EOF
+source ${ELECTRUM_DIR}/venv/bin/activate
+PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python ${REPO_DIR}/electrum-firo ${ELECTRUM_REGTEST_ARGS} "\$@" --password=${WALLET_PASSWORD}
+deactivate
+EOF
+chmod +x "${HARNESS_DIR}/electrum-cli"
+
 if [  "${STARTUP}" == "GUI" ];
 then
     echo "Starting GUI wallet"
@@ -126,5 +138,8 @@ else
     else
         echo "Starting CLI wallet"
         ./electrum-firo ${ELECTRUM_REGTEST_ARGS} -v daemon
+        # Run
+        #    ./electrum-cli load_wallet
+        # from the firo harness-ctl directory.
     fi
 fi
diff --git a/dex/testing/firo/test/electrumx_network_test.go b/dex/testing/firo/test/electrumx_network_test.go
index 71c2b0b86d..3d5d3a42f0 100644
--- a/dex/testing/firo/test/electrumx_network_test.go
+++ b/dex/testing/firo/test/electrumx_network_test.go
@@ -1,6 +1,8 @@
 // This code is available on the terms of the project LICENSE.md file,
 // also available online at https://blueoakcouncil.org/license/1.0.0.
 
+//go:build live
+
 // Connects to one ElectrumX-Firo testnet server and one ElectrumX-Firo
 // mainnet server and tests a subset of electrumx-firo commands.
 //
diff --git a/run_tests.sh b/run_tests.sh
index 601b97bb5f..657dd6007b 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -70,6 +70,7 @@ go test -c -o /dev/null -tags rpclive ./client/asset/eth
 go test -c -o /dev/null -tags harness ./client/asset/zec
 go test -c -o /dev/null -tags harness ./client/asset/dash
 go test -c -o /dev/null -tags harness ./client/asset/firo
+go test -c -o /dev/null -tags live ./dex/testing/firo/test
 go test -c -o /dev/null -tags dcrlive ./server/asset/dcr
 go test -c -o /dev/null -tags btclive ./server/asset/btc
 go test -c -o /dev/null -tags ltclive ./server/asset/ltc