diff --git a/python-control.changes b/python-control.changes
index b6f0d31..bfd23b1 100644
--- a/python-control.changes
+++ b/python-control.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Dec 31 19:31:35 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- Require Python >= 3.7: Disable Leap backport build. It keeps
+  failing due to unresolvable PyVirtualDisplay. We officially do
+  not support Python 3.6 in upstream anymore.
+
 -------------------------------------------------------------------
 Fri Dec 31 18:27:11 UTC 2021 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-control.spec b/python-control.spec
index c572abe..94ea04b 100644
--- a/python-control.spec
+++ b/python-control.spec
@@ -16,7 +16,6 @@
 #
 
 
-%{?!python_module:%define python_module() python3-%{**}}
 %define skip_python2 1
 %define skip_python36 1
 Name:           python-control
@@ -27,6 +26,7 @@ License:        BSD-3-Clause
 URL:            http://python-control.org
 Source:         https://files.pythonhosted.org/packages/source/c/control/control-%{version}.tar.gz
 Source1:        %{name}-rpmlintrc
+BuildRequires:  %{python_module base >= 3.7}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
@@ -55,8 +55,6 @@ operations for analysis and design of feedback control systems.
 %autosetup -p1 -n control-%{version}
 #remove shebang
 sed -i '1{\@^#!/usr/bin/env@ d}' control/tests/*.py
-# don't install toplevel benchmarks package
-sed -i "s/find_packages()/find_packages(exclude=['benchmarks'])/" setup.py
 
 %build
 %python_build
@@ -73,11 +71,7 @@ export MPLBACKEND="Qt5Agg"
 if [[ $(getconf LONG_BIT) == 32 ]]; then
 export LD_PRELOAD="%{_libdir}/libjemalloc.so.2"
 fi
-%if 0%{?suse_version} < 1550
-# segfault: free() error in Leap numpy library
-%define donttest -k "not (test_clean_part or test_pzmap)"
-%endif
-%pytest %{?donttest}
+%pytest
 
 %files %{python_files}
 %doc ChangeLog README.rst