diff --git a/docs/server/source/clusters-feds/aws-testing-cluster.md b/docs/server/source/appendices/aws-testing-cluster.md
similarity index 100%
rename from docs/server/source/clusters-feds/aws-testing-cluster.md
rename to docs/server/source/appendices/aws-testing-cluster.md
diff --git a/docs/server/source/appendices/index.rst b/docs/server/source/appendices/index.rst
index f5931e64..25eb7e19 100755
--- a/docs/server/source/appendices/index.rst
+++ b/docs/server/source/appendices/index.rst
@@ -18,6 +18,7 @@ Appendices
    backend
    commands
    aws-setup
+   aws-testing-cluster
    template-terraform-aws
    template-ansible
    azure-quickstart-template
diff --git a/docs/server/source/clusters-feds/index.rst b/docs/server/source/clusters-feds/index.rst
index 40e3b873..b1ac9a5d 100644
--- a/docs/server/source/clusters-feds/index.rst
+++ b/docs/server/source/clusters-feds/index.rst
@@ -5,5 +5,3 @@ Clusters
    :maxdepth: 1
 
    set-up-a-cluster
-   aws-testing-cluster
-   
diff --git a/docs/server/source/clusters-feds/set-up-a-cluster.md b/docs/server/source/clusters-feds/set-up-a-cluster.md
index 4b02bd9f..c7188ef0 100644
--- a/docs/server/source/clusters-feds/set-up-a-cluster.md
+++ b/docs/server/source/clusters-feds/set-up-a-cluster.md
@@ -1,6 +1,6 @@
 # Set Up a Cluster
 
-This section is about how to set up a BigchainDB cluster where each node is operated by a different operator. If you want to set up and run a testing cluster on AWS (where all nodes are operated by you), then see [the section about that](aws-testing-cluster.html).
+This section is about how to set up a BigchainDB cluster where each node is operated by a different operator.
 
 
 ## Initial Questions
diff --git a/docs/server/source/introduction.md b/docs/server/source/introduction.md
index 70066da2..5d06a035 100644
--- a/docs/server/source/introduction.md
+++ b/docs/server/source/introduction.md
@@ -23,7 +23,7 @@ There are some old RethinkDB-based deployment instructions as well:
 
 * [Deploy a bare-bones RethinkDB-based node on Azure](appendices/azure-quickstart-template.html)
 * [Deploy a bare-bones RethinkDB-based node on any Ubuntu machine with Ansible](appendices/template-ansible.html)
-* [Deploy a RethinkDB-based testing cluster on AWS](clusters-feds/aws-testing-cluster.html)
+* [Deploy a RethinkDB-based testing cluster on AWS](appendices/aws-testing-cluster.html)
 
 Instructions for setting up a client will be provided once there's a public test net.