diff --git a/setup.py b/setup.py
index ef91efa7..8ee8f875 100755
--- a/setup.py
+++ b/setup.py
@@ -19,25 +19,10 @@
 from io import open
 
 from setuptools import setup
-from setuptools.command.test import test as TestCommand
 
 __author__ = 'rohe0002'
 
 
-class PyTest(TestCommand):
-    def finalize_options(self):
-        TestCommand.finalize_options(self)
-        self.test_args = []
-        self.test_suite = True
-
-    def run_tests(self):
-        # import here, cause outside the eggs aren't loaded
-        import pytest
-
-        errno = pytest.main(self.test_args)
-        sys.exit(errno)
-
-
 tests_requires = ['responses', 'testfixtures', 'pytest', 'freezegun']
 
 with open('src/oic/__init__.py', 'r') as fd:
@@ -93,8 +78,6 @@ def run_tests(self):
         "defusedxml",
         'typing_extensions; python_version<"3.8"',
     ],
-    tests_require=tests_requires,
     long_description_content_type="text/x-rst",
     zip_safe=False,
-    cmdclass={'test': PyTest},
 )
diff --git a/src/oic/oic/provider.py b/src/oic/oic/provider.py
index bd66e82b..f6a557eb 100644
--- a/src/oic/oic/provider.py
+++ b/src/oic/oic/provider.py
@@ -1300,7 +1300,7 @@ def do_client_registration(self, request, client_id, ignore=None):
 
     @staticmethod
     def verify_redirect_uris(registration_request):
-        verified_redirect_uris = []
+        verified_redirect_uris: List[Tuple[str, Optional[Dict[str, List[str]]]]] = []
         try:
             client_type = registration_request["application_type"]
         except KeyError:  # default
@@ -1349,7 +1349,7 @@ def verify_redirect_uris(registration_request):
 
     def _verify_post_logout_uri(self, request):
         """Verify correct format of post_logout_redirect_uris."""
-        plruri = []
+        plruri: List[Tuple[str, Optional[Dict[str, List[str]]]]] = []
         for uri in request["post_logout_redirect_uris"]:
             part = urlparse(uri)
             if part.fragment: