diff --git a/python-networkx.changes b/python-networkx.changes
index 51cc940..c6f0479 100644
--- a/python-networkx.changes
+++ b/python-networkx.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb 23 18:12:59 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- Refine the optional test dependencies. We want to test python39 
+  in the future.
+
 -------------------------------------------------------------------
 Sat Feb 20 05:07:31 UTC 2021 - John Vandenberg <jayvdb@gmail.com>
 
diff --git a/python-networkx.spec b/python-networkx.spec
index 968b875..585fbc7 100644
--- a/python-networkx.spec
+++ b/python-networkx.spec
@@ -16,7 +16,7 @@
 #
 
 
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%{?!python_module:%define python_module() python3-%{**}}
 %define         skip_python2 1
 Name:           python-networkx
 Version:        2.5
@@ -50,14 +50,10 @@ BuildRequires:  %{python_module pygraphviz}
 BuildRequires:  %{python_module pyparsing}
 BuildRequires:  %{python_module pytest-xdist}
 BuildRequires:  %{python_module pytest}
-BuildRequires:  (python3-matplotlib >= 3.1 if python3-base < 3.8)
-BuildRequires:  (python3-numpy if python3-base < 3.8)
-BuildRequires:  (python3-pandas if python3-base < 3.8)
-BuildRequires:  (python3-scipy if python3-base < 3.8)
-BuildRequires:  (python38-matplotlib >= 3.1 if python38-base)
-BuildRequires:  (python38-numpy if python38-base)
-BuildRequires:  (python38-pandas if python38-base)
-BuildRequires:  (python38-scipy if python38-base)
+BuildRequires:  %{python_module matplotlib >= 3.1 if (%python-base without python36-base)}
+BuildRequires:  %{python_module numpy if (%python-base without python36-base)}
+BuildRequires:  %{python_module pandas if (%python-base without python36-base)}
+BuildRequires:  %{python_module scipy if (%python-base without python36-base)}
 # /SECTION
 %python_subpackages