diff --git a/python-heatclient/locale/python-heatclient.pot b/python-heatclient/locale/python-heatclient.pot
deleted file mode 100644
index e69de29b..00000000
diff --git a/setup.cfg b/setup.cfg
index d11fa7ae..9ca65449 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -54,13 +54,13 @@ universal = 1
 [extract_messages]
 keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
-output_file = python-heatclient/locale/python-heatclient.pot
+output_file = heatclient/locale/heatclient.pot
 
 [compile_catalog]
-directory = python-heatclient/locale
-domain = python-heatclient
+directory = heatclient/locale
+domain = heatclient
 
 [update_catalog]
-domain = python-heatclient
-output_dir = python-heatclient/locale
-input_file = python-heatclient/locale/python-heatclient.pot
+domain = heatclient
+output_dir = heatclient/locale
+input_file = heatclient/locale/heatclient.pot
diff --git a/tox.ini b/tox.ini
index 18fb577a..47371be0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,9 +32,6 @@ commands = oslo_debug_helper -t heatclient/tests {posargs}
 [testenv:pep8]
 commands =
     flake8
-    # Check that .po and .pot files are valid:
-    bash -c "find python-heatclient -type f -regex '.*\.pot?' -print0|xargs -0 -n 1 msgfmt --check-format -o /dev/null"
-whitelist_externals = bash
 
 [testenv:venv]
 commands = {posargs}