diff --git a/docs/server/source/dev-and-test/index.rst b/docs/server/source/dev-and-test/index.rst
index 4abc56de..f79c20a5 100644
--- a/docs/server/source/dev-and-test/index.rst
+++ b/docs/server/source/dev-and-test/index.rst
@@ -5,4 +5,4 @@ Develop & Test BigchainDB Server
    :maxdepth: 1
 
    setup-run-node
-   running-unit-tests
+   running-all-tests
diff --git a/docs/server/source/dev-and-test/running-unit-tests.md b/docs/server/source/dev-and-test/running-all-tests.md
similarity index 61%
rename from docs/server/source/dev-and-test/running-unit-tests.md
rename to docs/server/source/dev-and-test/running-all-tests.md
index c3347d79..f8e48422 100644
--- a/docs/server/source/dev-and-test/running-unit-tests.md
+++ b/docs/server/source/dev-and-test/running-all-tests.md
@@ -1,10 +1,10 @@
-# Running Unit Tests
+# Running All Tests
 
-Once you've installed BigchainDB Server, you may want to run all the unit tests. This section explains how.
+Once you've installed BigchainDB Server, you may want to run all the unit and integration tests. This section explains how.
 
-First of all, if you installed BigchainDB Server using `pip` (i.e. by getting the package from PyPI), then you didn't install the tests. **Before you can run all the unit tests, you must [install BigchainDB from source](setup-run-node.html#how-to-install-bigchaindb-from-source).**
+First of all, if you installed BigchainDB Server using `pip` (i.e. by getting the package from PyPI), then you didn't install the tests. **Before you can run all the tests, you must [install BigchainDB from source](setup-run-node.html#how-to-install-bigchaindb-from-source).**
 
-To run all the unit tests, first make sure you have RethinkDB running:
+To run all the tests, first make sure you have RethinkDB running:
 
 ```text
 $ rethinkdb
@@ -16,12 +16,12 @@ then in another terminal, do:
 $ python setup.py test
 ```
 
-(Aside: How does the above command work? The documentation for [pytest-runner](https://pypi.python.org/pypi/pytest-runner) explains. We use [pytest](http://docs.pytest.org/en/latest/) to write all unit tests.)
+(Aside: How does the above command work? The documentation for [pytest-runner](https://pypi.python.org/pypi/pytest-runner) explains. We use [pytest](http://docs.pytest.org/en/latest/) to write all unit and integration tests.)
 
 
 ### Using docker-compose to Run the Tests
 
-You can also use `docker-compose` to run the unit tests.
+You can also use `docker-compose` to run all the tests.
 
 Start `RethinkDB` in the background:
 
@@ -29,7 +29,7 @@ Start `RethinkDB` in the background:
 $ docker-compose up -d rdb
 ```
 
-then run the unit tests using:
+then run the tests using:
 
 ```text
 $ docker-compose run --rm bdb py.test -v