diff --git a/setup.cfg b/setup.cfg
index f704bbd90..6de76bfaa 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -87,7 +87,7 @@ tag_svn_revision = 0
 
 [compile_catalog]
 directory = cinder/locale
-domain = cinder
+domain = cinder cinder-log-error cinder-log-info cinder-log-warning
 
 [update_catalog]
 domain = cinder
diff --git a/tox.ini b/tox.ini
index 56d7aa1a5..a92ec9950 100644
--- a/tox.ini
+++ b/tox.ini
@@ -60,8 +60,6 @@ setenv =
 [testenv:pep8]
 commands =
   flake8 {posargs} .
-  # Check that .po and .pot files are valid:
-  bash -c "find cinder -type f -regex '.*\.pot?' -print0|xargs -0 -n 1 msgfmt --check-format -o /dev/null"
   {toxinidir}/tools/config/check_uptodate.sh
   {toxinidir}/tools/check_exec.py {toxinidir}/cinder