diff --git a/castellan/tests/functional/config.py b/castellan/tests/functional/config.py
index cd3aecf..c4c3663 100644
--- a/castellan/tests/functional/config.py
+++ b/castellan/tests/functional/config.py
@@ -49,7 +49,7 @@
     TEST_CONF.register_opts(identity_options, group=identity_group)
 
     config_to_load = []
-    local_config = './../../../etc/castellan/castellan-functional.conf'
+    local_config = './etc/castellan/castellan-functional.conf'
     main_config = '/etc/castellan/castellan-functional.conf'
     if os.path.isfile(config_file):
         config_to_load.append(config_file)
diff --git a/doc/source/testing.rst b/doc/source/testing.rst
index 7c7f314..2abd073 100644
--- a/doc/source/testing.rst
+++ b/doc/source/testing.rst
@@ -47,8 +47,8 @@
 .. _`Setting up a Barbican development environment`: http://docs.openstack.org/developer/barbican/setup/dev.html
 .. _`Using Keystone Middleware with Barbican`: http://docs.openstack.org/developer/barbican/setup/keystone.html
 
-Castellan uses ``/etc/castellan/castellan-functional.conf`` in order to
-run functional tests. A sample file can be generated by running:
+Castellan uses either ``/etc/castellan/castellan-functional.conf`` or ``./etc/castellan/castellan-functional.conf``
+in order to run functional tests. A sample file can be generated by running:
 
 .. code-block:: bash
 
@@ -57,7 +57,7 @@
 
 ``castellan/etc/castellan/castellan-functional.conf.sample`` is generated.
 It must be renamed to ``castellan-functional.conf`` and placed in
-``/etc/castellan``.
+``/etc/castellan`` or ``./etc/castellan``.
 
 The file should look something like the following: