diff --git a/etc/keystone-policy-generator.conf b/config-generator/keystone-policy-generator.conf
similarity index 100%
rename from etc/keystone-policy-generator.conf
rename to config-generator/keystone-policy-generator.conf
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 4dc3c47dc0..c2b9148f84 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -59,7 +59,9 @@ extensions = ['sphinx.ext.autodoc',
 config_generator_config_file = '../../config-generator/keystone.conf'
 sample_config_basename = '_static/keystone'
 
-policy_generator_config_file = '../../etc/keystone-policy-generator.conf'
+policy_generator_config_file = (
+    '../../config-generator/keystone-policy-generator.conf'
+)
 sample_policy_basename = '_static/keystone'
 
 todo_include_todos = True
diff --git a/tox.ini b/tox.ini
index 79a83b23c0..db00a2af45 100644
--- a/tox.ini
+++ b/tox.ini
@@ -124,7 +124,7 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasen
 commands = oslo-config-generator --config-file=config-generator/keystone.conf
 
 [testenv:genpolicy]
-commands = oslopolicy-sample-generator --config-file etc/keystone-policy-generator.conf
+commands = oslopolicy-sample-generator --config-file config-generator/keystone-policy-generator.conf
 
 [hacking]
 import_exceptions =