diff --git a/test/pytestconf.py b/test/pytestconf.py
deleted file mode 100644
index e88480f4395e0e7a3f41ed043b89fd5350eeff58_dGVzdC9weXRlc3Rjb25mLnB5..0000000000000000000000000000000000000000
--- a/test/pytestconf.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# copyright 2003-2010 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
-# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
-#
-# This file is part of CubicWeb.
-#
-# CubicWeb is free software: you can redistribute it and/or modify it under the
-# terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation, either version 2.1 of the License, or (at your option)
-# any later version.
-#
-# CubicWeb is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Lesser General Public License along
-# with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
-"""
-import os
-import sys
-
-from logilab.common.pytest import PyTester
-
-def getlogin():
-    """avoid usinng os.getlogin() because of strange tty / stdin problems
-    (man 3 getlogin)
-    Another solution would be to use $LOGNAME, $USER or $USERNAME
-    """
-    if sys.platform == 'win32':
-        return os.environ.get('USERNAME') or 'cubicweb'
-    import pwd
-    return pwd.getpwuid(os.getuid())[0]
-
-
-def update_parser(parser):
-    login = getlogin()
-    parser.add_option('-r', '--rebuild-database', dest='rebuild_db',
-                      default=False, action="store_true",
-                      help="remove tmpdb and rebuilds the test database")
-    parser.add_option('-u', '--dbuser', dest='dbuser', action='store',
-                      default=login, help="database user")
-    parser.add_option('-w', '--dbpassword', dest='dbpassword', action='store',
-                      default=login, help="database user's password")
-    parser.add_option('-n', '--dbname', dest='dbname', action='store',
-                      default=None, help="database name")
-    parser.add_option('--euser', dest='euser', action='store',
-                      default=login, help="euser name")
-    parser.add_option('--epassword', dest='epassword', action='store',
-                      default=login, help="euser's password' name")
-    return parser
-
-
-class CustomPyTester(PyTester):
-    def __init__(self, cvg, options):
-        super(CustomPyTester, self).__init__(cvg, options)
-        if options.rebuild_db:
-            os.unlink('tmpdb')
-            os.unlink('tmpdb-template')
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000000000000000000000000000000000000..8cd393f42052790d52819021163dd73c92d6fe8b_dG94LmluaQ==
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,24 @@
+[tox]
+envlist = py27,py3,flake8
+
+[testenv]
+deps =
+  pytest
+commands =
+  {envpython} -m pytest {posargs:test}
+
+[pytest]
+python_files = *test_*.py
+testpaths = test
+addopts = -r fEs
+
+[testenv:flake8]
+basepython = python3
+skip_install = true
+deps =
+  flake8
+commands = flake8
+
+[flake8]
+max-line-length=120
+exclude = test/data/*,.tox/*,doc/*
\ No newline at end of file