diff --git a/apitest/docs/api-beta-test-guide.md b/apitest/docs/api-beta-test-guide.md
index 341be835a2..4a110a303a 100644
--- a/apitest/docs/api-beta-test-guide.md
+++ b/apitest/docs/api-beta-test-guide.md
@@ -19,7 +19,7 @@ option adjustments to compensate.
 
 **Java SDK**:  Version 10, 11, or 12
 
-**Bitcoin-Core**:  Version 0.19 or 0.20
+**Bitcoin-Core**:  Version 0.19, 0.20, or 0.21
 
 **Git Client**
 
@@ -152,25 +152,6 @@ CLI command unless you change the server’s `–apiPort=<listening-port>`.   In
 `9998`, Bob’s is `9999`.  When you manually test the Api using the test harness, be aware of the port numbers being
 used in the CLI commands, so you know which server (Bob’s or Alice’s) the CLI is sending requests to.
 
-### Registering Test Dispute Agents
-
-If you ran the `trade-simulation.sh` script in your currently running test harness, dispute agents have
-already been registered in the arbitration node, and you can run any of the commands described in the following
-sections.
-
-If you have not run the `trade-simulation.sh` script against the test harness, you will need to
-manually register dispute agents in the arbitration node before you can initiate a trade.  Copy, paste and run
-the following CLI commands to register a `mediator` and a `refundagent`.  Do not change the commands' port `9997`
-option (the test arbitration node's listening port).
-```
-$ ./bisq-cli --password=xyz --port=9997 registerdisputeagent --dispute-agent-type=mediator \
-    --registration-key=6ac43ea1df2a290c1c8391736aa42e4339c5cb4f110ff0257a13b63211977b7a
-
-$ ./bisq-cli --password=xyz --port=9997 registerdisputeagent --dispute-agent-type=refundagent \
-    --registration-key=6ac43ea1df2a290c1c8391736aa42e4339c5cb4f110ff0257a13b63211977b7a
-```
-_Note:  The API cannot be used to register dispute agents on nodes connected to `mainnet`._
-
 ### CLI Help
 
 Useful information can be found using the CLI’s `--help` option.
diff --git a/apitest/scripts/limit-order-simulation.sh b/apitest/scripts/limit-order-simulation.sh
index 33312ae73b..db37d8ab94 100755
--- a/apitest/scripts/limit-order-simulation.sh
+++ b/apitest/scripts/limit-order-simulation.sh
@@ -6,7 +6,7 @@
 #
 # Prerequisites:
 #
-#  - Linux or OSX with bash, Java 10, or Java 11-12 (JDK language compatibility 10), and bitcoin-core (v0.19, v0.20).
+#  - Linux or OSX with bash, Java 10, or Java 11-12 (JDK language compatibility 10), and bitcoin-core (v0.19, v0.20, v0.21).
 #
 #  - Bisq must be fully built with apitest dao setup files installed.
 #    Build command:  `./gradlew clean build :apitest:installDaoSetup`
diff --git a/apitest/scripts/rolling-offer-simulation.sh b/apitest/scripts/rolling-offer-simulation.sh
index 5ab1eecc88..c269940e64 100755
--- a/apitest/scripts/rolling-offer-simulation.sh
+++ b/apitest/scripts/rolling-offer-simulation.sh
@@ -10,7 +10,7 @@
 #
 # Prerequisites:
 #
-#  - Linux or OSX with bash, Java 10, or Java 11-12 (JDK language compatibility 10), and bitcoin-core (v0.19, v0.20).
+#  - Linux or OSX with bash, Java 10, or Java 11-12 (JDK language compatibility 10), and bitcoin-core (v0.19, v0.20, v0.21).
 #
 #  - Bisq must be fully built with apitest dao setup files installed.
 #    Build command:  `./gradlew clean build :apitest:installDaoSetup`
diff --git a/apitest/scripts/trade-simulation.sh b/apitest/scripts/trade-simulation.sh
index f37e2a6c4a..5aa540bf71 100755
--- a/apitest/scripts/trade-simulation.sh
+++ b/apitest/scripts/trade-simulation.sh
@@ -7,7 +7,7 @@
 #
 # Prerequisites:
 #
-#  - Linux or OSX with bash, Java 10, or Java 11-12 (JDK language compatibility 10), and bitcoin-core (v0.19, v0.20).
+#  - Linux or OSX with bash, Java 10, or Java 11-12 (JDK language compatibility 10), and bitcoin-core (v0.19, v0.20, or v0.21).
 #
 #  - Bisq must be fully built with apitest dao setup files installed.
 #    Build command:  `./gradlew clean build :apitest:installDaoSetup`
diff --git a/apitest/src/main/java/bisq/apitest/ApiTestMain.java b/apitest/src/main/java/bisq/apitest/ApiTestMain.java
index b79fe6cc3b..20a40850ec 100644
--- a/apitest/src/main/java/bisq/apitest/ApiTestMain.java
+++ b/apitest/src/main/java/bisq/apitest/ApiTestMain.java
@@ -43,7 +43,7 @@ import bisq.apitest.config.ApiTestConfig;
  *
  * All method, scenario and end to end tests are found in the test sources folder.
  *
- * Requires bitcoind v0.19.x
+ * Requires bitcoind v0.19, v0.20, or v0.21.
  */
 @Slf4j
 public class ApiTestMain {
diff --git a/apitest/src/main/java/bisq/apitest/linux/AbstractLinuxProcess.java b/apitest/src/main/java/bisq/apitest/linux/AbstractLinuxProcess.java
index 770df37ede..83ae6718ae 100644
--- a/apitest/src/main/java/bisq/apitest/linux/AbstractLinuxProcess.java
+++ b/apitest/src/main/java/bisq/apitest/linux/AbstractLinuxProcess.java
@@ -108,8 +108,8 @@ abstract class AbstractLinuxProcess implements LinuxProcess {
         File bitcoindExecutable = Paths.get(config.bitcoinPath, "bitcoind").toFile();
         if (!bitcoindExecutable.exists() || !bitcoindExecutable.canExecute())
             throw new IllegalStateException(format("'%s' cannot be found or executed.%n"
-                            + "A bitcoin-core v0.19.X installation is required, and" +
-                            " the 'bitcoinPath' must be configured in 'apitest.properties'",
+                            + "A bitcoin-core v0.19, v0.20, or v0.21 installation is required," +
+                            " and the 'bitcoinPath' must be configured in 'apitest.properties'",
                     bitcoindExecutable.getAbsolutePath()));
 
         File bitcoindDatadir = new File(config.bitcoinDatadir);