diff --git a/python-networkx.changes b/python-networkx.changes
index 23cd259..c6f0479 100644
--- a/python-networkx.changes
+++ b/python-networkx.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+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>
+
+- Re-enable Python 3.6 builds without optional dependencies
+- Add test dependencies lxml, pandas and pygraphviz
+
 -------------------------------------------------------------------
 Mon Feb  1 14:05:38 UTC 2021 - Benjamin Greiner <code@bnavigator.de>
 
diff --git a/python-networkx.spec b/python-networkx.spec
index ddfd1de..585fbc7 100644
--- a/python-networkx.spec
+++ b/python-networkx.spec
@@ -16,9 +16,8 @@
 #
 
 
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%{?!python_module:%define python_module() python3-%{**}}
 %define         skip_python2 1
-%define         skip_python36 1
 Name:           python-networkx
 Version:        2.5
 Release:        0
@@ -29,26 +28,33 @@ Source:         https://files.pythonhosted.org/packages/source/n/networkx/networ
 Patch0:         0001-Replace-hash-function-for-test-of-weighted-astar.patch
 # PATCH-FIX-UPSTREAM https://github.com/networkx/networkx/commit/a6dd458a12ad8db161271e2271644803d4f29a96 fixes Github Actions failures
 Patch1:         yaml-loader.patch
-BuildRequires:  %{python_module PyYAML}
-BuildRequires:  %{python_module decorator >= 3.4.0}
-BuildRequires:  %{python_module matplotlib >= 3.1}
-BuildRequires:  %{python_module pydot}
-BuildRequires:  %{python_module pyparsing}
-BuildRequires:  %{python_module pytest-xdist}
-BuildRequires:  %{python_module pytest}
-BuildRequires:  %{python_module scipy}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 BuildRequires:  unzip
 Requires:       python-decorator >= 3.4.0
 Recommends:     python-PyYAML
-Recommends:     python-matplotlib >= 3.1
 Recommends:     python-pydot
 Recommends:     python-pygraphviz
 Recommends:     python-pyparsing
-Recommends:     python-scipy
+Suggests:       python-matplotlib >= 3.1
+Suggests:       python-pandas
+Suggests:       python-scipy
 BuildArch:      noarch
+# SECTION test requirements
+BuildRequires:  %{python_module PyYAML}
+BuildRequires:  %{python_module decorator >= 3.4.0}
+BuildRequires:  %{python_module lxml}
+BuildRequires:  %{python_module pydot}
+BuildRequires:  %{python_module pygraphviz}
+BuildRequires:  %{python_module pyparsing}
+BuildRequires:  %{python_module pytest-xdist}
+BuildRequires:  %{python_module pytest}
+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
 
 %description
@@ -104,7 +110,8 @@ popd
 %check
 # gh#networkx/networkx#4030 we cannot use -n auto because
 # TestKatzCentralityDirectedNumpy fails otherwise
-%pytest
+# (pandas) test_from_adjacency_named fails on i586
+%pytest -rs -k 'not test_from_adjacency_named'
 
 %files %{python_files}
 %license LICENSE.txt