diff --git a/README.rst b/README.rst
index 0d1e405..2419e1b 100644
--- a/README.rst
+++ b/README.rst
@@ -1,12 +1,12 @@
 ===============================
-coverage2sql
+coverage2sql README
 ===============================
 
 Command to Read a coverage file and put the data in a SQL database
 
-Please feel here a long description which must be at least 3 lines wrapped on
-80 cols, so that distribution package maintainers can use it in their packages.
-Note that this is a hard requirement.
+coverage2sql is a tool for storing data of test coverage into a SQL database.
+With using this tool, you can store time series coverage data and analyze it
+if your coverage rate is down.
 
 * Free software: Apache license
 * Documentation: http://docs.openstack.org/developer/coverage2sql
diff --git a/test-requirements.txt b/test-requirements.txt
index 21a7e3b..3858eb7 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -12,3 +12,4 @@ oslotest>=1.10.0 # Apache-2.0
 testrepository>=0.0.18
 testscenarios>=0.4
 testtools>=1.4.0
+os-testr
diff --git a/tox.ini b/tox.ini
index d4cd6e3..d65d624 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,60 +1,40 @@
 [tox]
 minversion = 2.0
-envlist = py34-constraints,py27-constraints,pypy-constraints,pep8-constraints
+envlist = py34,py27,pypy,pep8
 skipsdist = True
 
 [testenv]
 usedevelop = True
-install_command =
-                  constraints: {[testenv:common-constraints]install_command}
-                  pip install -U {opts} {packages}
-setenv =
-   VIRTUAL_ENV={envdir}
-deps = -r{toxinidir}/test-requirements.txt
-commands = python setup.py test --slowest --testr-args='{posargs}'
-
-[testenv:common-constraints]
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
+install_command = pip install -U --force-reinstall {opts} {packages}
+setenv = VIRTUAL_ENV={envdir}
+whitelist_externals = find
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+commands =
+    find . -type f -name "*.pyc" -delete
+    ostestr {posargs}
 
 [testenv:pep8]
-commands = flake8 {posargs}
-
-[testenv:pep8-constraints]
-install_command = {[testenv:common-constraints]install_command}
-commands = flake8 {posargs}
+sitepackages = False
+commands =
+    flake8 {posargs}
 
 [testenv:venv]
 commands = {posargs}
 
-[testenv:venv-constraints]
-install_command = {[testenv:common-constraints]install_command}
-commands = {posargs}
-
 [testenv:cover]
 commands = python setup.py test --coverage --testr-args='{posargs}'
 
-[testenv:cover-constraints]
-install_command = {[testenv:common-constraints]install_command}
-commands = python setup.py test --coverage --testr-args='{posargs}'
-
 [testenv:docs]
 commands = python setup.py build_sphinx
 
-[testenv:docs-constraints]
-install_command = {[testenv:common-constraints]install_command}
-commands = python setup.py build_sphinx
-
 [testenv:debug]
 commands = oslo_debug_helper {posargs}
 
-[testenv:debug-constraints]
-install_command = {[testenv:common-constraints]install_command}
-commands = oslo_debug_helper {posargs}
-
 [flake8]
 # E123, E125 skipped as they are invalid PEP-8.
 
 show-source = True
 ignore = E123,E125
 builtins = _
-exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
+exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build