diff --git a/setup.cfg b/setup.cfg
index 3d9c412..a9810ce 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,6 +4,3 @@ universal = 1
 [flake8]
 ignore = W503
 max_line_length = 88
-
-[pycodestyle]
-max_line_length = 88
diff --git a/setup.py b/setup.py
index dc413ed..ec7d16e 100755
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,9 @@ setup(
     author="Amr Hassan <amr.hassan@gmail.com> and Contributors",
     author_email="amr.hassan@gmail.com",
     url="https://github.com/pylast/pylast",
-    tests_require=["coverage", "flaky", "pycodestyle", "pyflakes", "pytest", "pyyaml"],
+    extras_require={
+        "tests": ["flaky", "pytest", "pytest-cov", "pytest-random-order", "pyyaml"]
+    },
     python_requires=">=3.5",
     classifiers=[
         "Development Status :: 5 - Production/Stable",
diff --git a/tox.ini b/tox.ini
index ad7fbc8..9107481 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,18 +3,12 @@ envlist = py38, py37, py36, py35, pypy3
 recreate = False
 
 [testenv]
+extras = tests
 setenv =
     PYLAST_USERNAME={env:PYLAST_USERNAME:}
     PYLAST_PASSWORD_HASH={env:PYLAST_PASSWORD_HASH:}
     PYLAST_API_KEY={env:PYLAST_API_KEY:}
     PYLAST_API_SECRET={env:PYLAST_API_SECRET:}
-deps =
-    pyyaml
-    pytest
-    ipdb
-    pytest-cov
-    pytest-random-order
-    flaky
 commands = pytest -v -s -W all --cov pylast --cov-report term-missing --random-order {posargs}
 
 [testenv:venv]