diff --git a/.gitignore b/.gitignore
index fc70090c..db9849fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@ htmlcov/
 .cache
 nosetests.xml
 coverage.xml
+cover
 
 # Translations
 *.mo
@@ -47,3 +48,6 @@ docs/_build/
 
 # Rope
 .ropeproject/
+
+# Others
+*.sqlite
diff --git a/etc/cloudkitty/cloudkitty.conf.sample b/etc/cloudkitty/cloudkitty.conf.sample
index c9064618..0be63e83 100644
--- a/etc/cloudkitty/cloudkitty.conf.sample
+++ b/etc/cloudkitty/cloudkitty.conf.sample
@@ -422,8 +422,9 @@
 # Deprecated group/name - [DATABASE]/sql_max_pool_size
 #max_pool_size=<None>
 
-# Maximum db connection retries during startup. Set to -1 to
-# specify an infinite retry count. (integer value)
+# Maximum number of database connection retries during
+# startup. Set to -1 to specify an infinite retry count.
+# (integer value)
 # Deprecated group/name - [DEFAULT]/sql_max_retries
 # Deprecated group/name - [DATABASE]/sql_max_retries
 #max_retries=10
diff --git a/requirements.txt b/requirements.txt
index f4c48170..c7215035 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ iso8601
 PasteDeploy==1.5.2
 posix_ipc
 pecan==0.5.0
-wsme
+WSME>=0.6,!=0.6.2
 oslo.config>=1.2.0
 oslo.messaging
 oslo.db
diff --git a/tox.ini b/tox.ini
index fd45e312..e09a8bf8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,6 +21,23 @@ commands =
   flake8 {posargs} cloudkitty
   {toxinidir}/tools/config/check_uptodate.sh
 
+[testenv:cover]
+setenv = VIRTUAL_ENV={envdir}
+commands =
+  python setup.py testr --coverage {posargs}
+
+[testenv:checkconfig]
+sitepackages = False
+envdir = {toxworkdir}/venv
+commands =
+  {toxinidir}/tools/config/check_uptodate.sh
+
+[testenv:genconfig]
+sitepackages = False
+envdir = {toxworkdir}/venv
+commands =
+  bash tools/config/generate_sample.sh -b . -p cloudkitty -o etc/cloudkitty
+
 [testenv:docs]
 commands = python setup.py build_sphinx