diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 00000000..3be22c69
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,3 @@
+[pytest]
+markers =
+    mvp: mark tests as required by MVP
diff --git a/requirements.txt b/requirements.txt
index 5996c1c1..89155f83 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,8 +16,7 @@ marshmallow==3.0.0b11
 marshmallow-enum==1.4.1
 passlib==1.7.1
 phonenumbers==8.9.11
-pytest==3.7.2
-pytest-runner==4.2
+pytest==7.0.0
 python-dateutil==2.7.3
 python-stdnum==1.9
 PyYAML==5.4
diff --git a/setup.py b/setup.py
index 6a0db9b9..287cf651 100644
--- a/setup.py
+++ b/setup.py
@@ -3,11 +3,6 @@ from setuptools import find_packages, setup
 from ereuse_devicehub import __version__
 
 
-test_requires = [
-    'pytest',
-    'requests_mock'
-]
-
 setup(
     name='ereuse-devicehub',
     version=__version__,
@@ -52,17 +47,12 @@ setup(
         'docs-auto': [
             'sphinx-autobuild'
         ],
-        'test': test_requires
     },
-    tests_require=test_requires,
     entry_points={
         'console_scripts': [
             'dh = ereuse_devicehub.cli:cli'
         ]
     },
-    setup_requires=[
-        'pytest-runner'
-    ],
     classifiers=[
         'Development Status :: 2 - Pre-Alpha',
         'Environment :: Web Environment',
@@ -71,8 +61,7 @@ setup(
         'License :: OSI Approved :: GNU Affero General Public License v3',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 3 :: Only',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
         'Topic :: Internet :: WWW/HTTP :: WSGI :: Application',
         'Topic :: Software Development :: Libraries :: Python Modules',