diff --git a/HACKING.rst b/HACKING.rst
index 6bd24b0174..d66687e351 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -250,8 +250,7 @@ These scripts are executed serially by ``exercise.sh`` in testing situations.
   database access from the exercise itself.
 
 * If specific configuration needs to be present for the exercise to complete,
-  it should be staged in ``stack.sh``, or called from ``stack.sh`` (see
-  ``files/keystone_data.sh`` for an example of this).
+  it should be staged in ``stack.sh``, or called from ``stack.sh``.
 
 * The ``OS_*`` environment variables should be the only ones used for all
   authentication to OpenStack clients as documented in the CLIAuth_ wiki page.
diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index 22841f6c13..d87809a1e6 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -394,7 +394,7 @@ with ``KEYSTONE_CATALOG_BACKEND``:
         KEYSTONE_CATALOG_BACKEND=template
 
 DevStack's default configuration in ``sql`` mode is set in
-``files/keystone_data.sh``
+``lib/keystone``
 
 
 Guest Images
diff --git a/lib/tempest b/lib/tempest
index 691ad86a2d..76fd6cac74 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -23,7 +23,7 @@
 #
 # Optional Dependencies:
 #
-# - ``ALT_*`` (similar vars exists in keystone_data.sh)
+# - ``ALT_*``
 # - ``LIVE_MIGRATION_AVAILABLE``
 # - ``USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION``
 # - ``DEFAULT_INSTANCE_TYPE``