diff --git a/python-oauthlib.spec b/python-oauthlib.spec
index c58ce11..dca614c 100644
--- a/python-oauthlib.spec
+++ b/python-oauthlib.spec
@@ -2,7 +2,7 @@
 
 Name:               python-oauthlib
 Version:            3.1.0
-Release:            1%{?dist}
+Release:            2%{?dist}
 Summary:            An implementation of the OAuth request-signing logic
 
 License:            BSD
@@ -34,18 +34,15 @@ very little effort.
 Summary:            An implementation of the OAuth request-signing logic
 %{?python_provide:%python_provide python3-oauthlib}
 
+Obsoletes:          python3-oauthlib+signedtoken < 3.1.0-2
+
 BuildRequires:      python3-devel
 BuildRequires:      python3-setuptools
 
+BuildRequires:      python3-pytest
 BuildRequires:      python3-blinker
-
-BuildRequires:      python3-jwt >= 1.6.0
 BuildRequires:      python3-cryptography >= 1.4.0
 
-%{?python_extras_subpkg:Recommends: python3-oauthlib+signedtoken}
-%{!?python_extras_subpkg:Requires:  python3-jwt >= 1.6.0}
-%{!?python_extras_subpkg:Requires:  python3-cryptography >= 1.4.0}
-
 %description -n python3-oauthlib
 OAuthLib is a generic utility which implements the logic of OAuth without
 assuming a specific HTTP request object or web framework. Use it to graft
@@ -54,8 +51,6 @@ onto your favourite web framework. If you're a maintainer of such a
 library, write a thin veneer on top of OAuthLib and get OAuth support for
 very little effort.
 
-%{?python_extras_subpkg:%python_extras_subpkg -n python3-oauthlib -i %{python3_sitelib}/%{modname}-%{version}-*.egg-info signedtoken}
-
 %prep
 %setup -q -n %{modname}-%{version}
 %patch0001 -p1
@@ -76,7 +71,9 @@ rm -rf %{modname}.egg-info
 %py3_install
 
 %check
-%{__python3} setup.py test
+echo 'import pytest; __getattr__ = lambda _: pytest.skip("this test needs jwt")' > jwt.py
+%pytest -rs --ignore tests/oauth2/rfc6749/clients/test_service_application.py
+rm jwt.py
 
 %files -n python3-oauthlib
 %doc README.rst
@@ -85,6 +82,11 @@ rm -rf %{modname}.egg-info
 %{python3_sitelib}/%{modname}-%{version}-*
 
 %changelog
+* Mon May 31 2021 Miro Hrončok <mhroncok@redhat.com> - 3.1.0-2
+- Remove the python3-oauthlib+signedtoken package
+- When building, skip tests that require jwt
+- Resolves: rhbz#1966407 - Drop python-jwt dependency from python-oauthlib
+
 * Tue May 25 2021 Jakub Hrozek <jhrozek@redhat.com> - 3.1.0-1
 - Resolves: rhbz#1922352 - python-oauthlib requires python-mock
 - Update to upstream 3.1.0