diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 07e854ac..de792ecd 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -218,6 +218,7 @@ function configure_aodh {
     iniset $AODH_CONF oslo_policy policy_file $AODH_CONF_DIR/policy.json
 
     cp $AODH_DIR/etc/aodh/api_paste.ini $AODH_CONF_DIR
+    cp $AODH_DIR/etc/aodh/aodh-config-generator.conf $AODH_CONF_DIR
 
     # The alarm evaluator needs these options to call gnocchi/ceilometer APIs
     iniset $AODH_CONF service_credentials auth_type password
diff --git a/aodh-config-generator.conf b/etc/aodh/aodh-config-generator.conf
similarity index 100%
rename from aodh-config-generator.conf
rename to etc/aodh/aodh-config-generator.conf
diff --git a/tox.ini b/tox.ini
index 6c1b60ac..0d87d49e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@ setenv = VIRTUAL_ENV={envdir}
 passenv = OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE
 commands =
    python setup.py testr --slowest --testr-args="{posargs}"
-   oslo-config-generator --config-file=aodh-config-generator.conf
+   oslo-config-generator --config-file=etc/aodh/aodh-config-generator.conf
 whitelist_externals = bash
 
 [testenv:py27-hbase]
@@ -72,7 +72,7 @@ deps = .[doc]
 commands = sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [testenv:genconfig]
-commands = oslo-config-generator --config-file=aodh-config-generator.conf
+commands = oslo-config-generator --config-file=etc/aodh/aodh-config-generator.conf
 
 [testenv:docs]
 deps = .[doc]