diff --git a/doc/source/conf.py b/doc/source/conf.py
index 960c97cf946..68304f1d5e2 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -63,7 +63,7 @@ extensions = ['sphinx.ext.autodoc',
               ]
 
 config_generator_config_file = (
-    '../../cinder/config/cinder-config-generator.conf')
+    '../../tools/config/cinder-config-generator.conf')
 sample_config_basename = '_static/cinder'
 
 # autodoc generation is a bit aggressive and a nuisance
diff --git a/cinder/config/__init__.py b/tools/config/__init__.py
similarity index 100%
rename from cinder/config/__init__.py
rename to tools/config/__init__.py
diff --git a/cinder/config/cinder-config-generator.conf b/tools/config/cinder-config-generator.conf
similarity index 100%
rename from cinder/config/cinder-config-generator.conf
rename to tools/config/cinder-config-generator.conf
diff --git a/cinder/config/generate_cinder_opts.py b/tools/config/generate_cinder_opts.py
similarity index 100%
rename from cinder/config/generate_cinder_opts.py
rename to tools/config/generate_cinder_opts.py
diff --git a/tox.ini b/tox.ini
index f161e92d774..740ca104a28 100644
--- a/tox.ini
+++ b/tox.ini
@@ -81,12 +81,12 @@ commands =
 [testenv:genconfig]
 sitepackages = False
 envdir = {toxworkdir}/pep8
-commands = oslo-config-generator --config-file=cinder/config/cinder-config-generator.conf
+commands = oslo-config-generator --config-file=tools/config/cinder-config-generator.conf
 
 [testenv:genopts]
 sitepackages = False
 envdir = {toxworkdir}/pep8
-commands = python cinder/config/generate_cinder_opts.py
+commands = python tools/config/generate_cinder_opts.py
 
 [testenv:venv]
 commands = {posargs}