diff --git a/tools/build-all-rst.sh b/tools/build-all-rst.sh
index aa3b0eeb0..b06ad3a2d 100755
--- a/tools/build-all-rst.sh
+++ b/tools/build-all-rst.sh
@@ -3,4 +3,4 @@
 mkdir -p publish-docs
 
 tools/build-firstapp-rst.sh
-tools/build-api-start.sh
+tools/build-api-quick-start.sh
diff --git a/tools/build-api-quick-start.sh b/tools/build-api-quick-start.sh
new file mode 100755
index 000000000..368508fa5
--- /dev/null
+++ b/tools/build-api-quick-start.sh
@@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+mkdir -p publish-docs
+
+tools/build-rst.sh api-quick-start --target api-ref/api/quick-start
diff --git a/tools/build-api-start.sh b/tools/build-api-start.sh
deleted file mode 100755
index 03eedc961..000000000
--- a/tools/build-api-start.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-mkdir -p publish-docs
-
-tools/build-rst.sh api-quick-start --target api-quick-start
diff --git a/tox.ini b/tox.ini
index 4fdc27006..b971d0b83 100644
--- a/tox.ini
+++ b/tox.ini
@@ -48,8 +48,7 @@ commands =
 [testenv:publishdocs]
 # Prepare documents (without www) so that they can get published on
 # docs.openstack.org with just copying publish-docs/* over.
-commands =
-  {toxinidir}/tools/build-api-start.sh
+commands = true
 
 [testenv:publishdocs-api]
 # Prepare documents (without www) so that they can get published on
@@ -62,6 +61,8 @@ commands =
   {toxinidir}/tools/build-firstapp-rst.sh
   # Delete firstapp draft documents
   rm -rf publish-docs/draft/
+  # Build and copy API Quick Start
+  {toxinidir}/tools/build-api-quick-start.sh
 
 [testenv:checklang]
 # openstack-generate-docbook needs xml2po which cannot be installed in
@@ -123,7 +124,7 @@ commands = sphinx-build -E -W -t shade firstapp/source firstapp/build-shade/html
 
 [testenv:api-quick-start]
 commands =
-  {toxinidir}/tools/build-api-start.sh
+  {toxinidir}/tools/build-api-quick-start.sh
 
 [doc8]
 # Settings for doc8: