diff --git a/python-cairocffi.changes b/python-cairocffi.changes
index 6e8af7c..cacf826 100644
--- a/python-cairocffi.changes
+++ b/python-cairocffi.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Aug 19 15:40:07 UTC 2022 - Ben Greiner <code@bnavigator.de>
+
+- Reflect in the specfile that Python 3.6 is no longer supported
+  upstream
+- Unskip python38: required by other packages
+- Remove python36 flavor exceptions from specfile
+
 -------------------------------------------------------------------
 Sun Aug  7 12:09:38 UTC 2022 - John Vandenberg <jayvdb@gmail.com>
 
diff --git a/python-cairocffi.spec b/python-cairocffi.spec
index 5406639..0c65133 100644
--- a/python-cairocffi.spec
+++ b/python-cairocffi.spec
@@ -16,9 +16,6 @@
 #
 
 
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%define skip_python2 1
-%define skip_python38 1
 Name:           python-cairocffi
 Version:        1.3.0
 Release:        0
@@ -27,22 +24,23 @@ License:        BSD-3-Clause
 Group:          Development/Languages/Python
 URL:            https://github.com/Kozea/cairocffi
 Source:         https://files.pythonhosted.org/packages/source/c/cairocffi/cairocffi-%{version}.tar.gz
+BuildRequires:  %{python_module base >= 3.7}
+BuildRequires:  %{python_module cffi >= 1.1.0}
 BuildRequires:  %{python_module setuptools >= 39.2.0}
+BuildRequires:  %{python_module xcffib >= 0.3.2}
 BuildRequires:  cairo
 Requires:       cairo
 Requires:       python-cffi >= 1.1.0
 Requires:       python-xcffib >= 0.3.2
 BuildArch:      noarch
 # SECTION test requirements
-BuildRequires:  %{python_module cffi >= 1.1.0}
+BuildRequires:  %{python_module numpy}
 BuildRequires:  %{python_module pytest}
-BuildRequires:  %{python_module xcffib >= 0.3.2}
 BuildRequires:  dejavu-fonts
 BuildRequires:  fdupes
 BuildRequires:  gdk-pixbuf
 BuildRequires:  python-rpm-macros
 BuildRequires:  xvfb-run
-BuildRequires:  %{python_module numpy if (%python-base without python36-base)}
 # /SECTION
 %python_subpackages
 
@@ -89,15 +87,13 @@ sed -i 's/^from \./from cairocffi./' tests/*.py
 
 %check
 cd tests/
-# Don't test with NumPy in the python36 flavor, because python36-numpy is not in TW anymore
-python36_ignore="--ignore test_numpy.py"
-%python_expand PYTHONPATH="%{buildroot}%{$python_sitelib}" xvfb-run --server-args="-screen 0 1280x1024x16" $python -m pytest ${$python_ignore}
+%python_expand PYTHONPATH="%{buildroot}%{$python_sitelib}" xvfb-run --server-args="-screen 0 1280x1024x16" $python -B -m pytest
 
 %files %{python_files}
 %license LICENSE
 %doc README.rst
-%{python_sitelib}/cairocffi-%{version}-py*.egg-info
-%{python_sitelib}/cairocffi/
+%{python_sitelib}/cairocffi-%{version}*-info
+%{python_sitelib}/cairocffi
 %exclude %{python_sitelib}/cairocffi/pixbuf.py*
 %ifpycache
 %exclude %{python_sitelib}/cairocffi/__pycache__/pixbuf.*