diff --git a/python-networkx.spec b/python-networkx.spec
index bc462a7..00439e8 100644
--- a/python-networkx.spec
+++ b/python-networkx.spec
@@ -2,7 +2,7 @@
 
 Name:           python-%{srcname}
 Version:        2.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Creates and Manipulates Graphs and Networks
 License:        BSD
 URL:            http://networkx.github.io/
@@ -73,17 +73,14 @@ Provides:       python3-%{srcname}-geo = %{version}-%{release}
 Obsoletes:      python3-%{srcname}-drawing < 2.0
 Provides:       python3-%{srcname}-drawing = %{version}-%{release}
 
+# This can be removed when Fedora 30 reaches EOL
+Obsoletes:      python3-%{srcname}-test < 2.3-2
+Provides:       python3-%{srcname}-test = %{version}-%{release}
+
 %description -n python3-%{srcname}
 NetworkX is a Python 3 package for the creation, manipulation, and
 study of the structure, dynamics, and functions of complex networks.
 
-%package -n python3-%{srcname}-test
-Summary:        Test code for NetworkX
-Requires:       python3-%{srcname} = %{version}-%{release}
-
-%description -n python3-%{srcname}-test
-This package contains test code for NetworkX.  Most users do not need it.
-
 %package doc
 Summary:        Documentation for networkx
 Provides:       bundled(jquery)
@@ -142,63 +139,14 @@ grep -rlZ '^#!' %{buildroot}%{python3_sitelib}/networkx | xargs -0 chmod a+x
 %doc README.rst installed-docs/*
 %license LICENSE.txt
 %{python3_sitelib}/networkx*
-%exclude %{python3_sitelib}/networkx/algorithms/approximation/tests/
-%exclude %{python3_sitelib}/networkx/algorithms/assortativity/tests/
-%exclude %{python3_sitelib}/networkx/algorithms/bipartite/tests/
-%exclude %{python3_sitelib}/networkx/algorithms/centrality/tests/
-%exclude %{python3_sitelib}/networkx/algorithms/coloring/tests/
-%exclude %{python3_sitelib}/networkx/algorithms/community/tests/
-%exclude %{python3_sitelib}/networkx/algorithms/components/tests/
-%exclude %{python3_sitelib}/networkx/algorithms/connectivity/tests/
-%exclude %{python3_sitelib}/networkx/algorithms/flow/tests/
-%exclude %{python3_sitelib}/networkx/algorithms/isomorphism/tests/
-%exclude %{python3_sitelib}/networkx/algorithms/link_analysis/tests/
-%exclude %{python3_sitelib}/networkx/algorithms/node_classification/tests/
-%exclude %{python3_sitelib}/networkx/algorithms/operators/tests/
-%exclude %{python3_sitelib}/networkx/algorithms/shortest_paths/tests/
-%exclude %{python3_sitelib}/networkx/algorithms/tests/
-%exclude %{python3_sitelib}/networkx/algorithms/traversal/tests/
-%exclude %{python3_sitelib}/networkx/algorithms/tree/tests/
-%exclude %{python3_sitelib}/networkx/classes/tests/
-%exclude %{python3_sitelib}/networkx/drawing/tests/
-%exclude %{python3_sitelib}/networkx/generators/tests/
-%exclude %{python3_sitelib}/networkx/linalg/tests/
-%exclude %{python3_sitelib}/networkx/readwrite/json_graph/tests/
-%exclude %{python3_sitelib}/networkx/readwrite/tests/
-%exclude %{python3_sitelib}/networkx/tests/
-%exclude %{python3_sitelib}/networkx/utils/tests/
-
-%files -n python3-networkx-test
-%{python3_sitelib}/networkx/algorithms/approximation/tests/
-%{python3_sitelib}/networkx/algorithms/assortativity/tests/
-%{python3_sitelib}/networkx/algorithms/bipartite/tests/
-%{python3_sitelib}/networkx/algorithms/centrality/tests/
-%{python3_sitelib}/networkx/algorithms/coloring/tests/
-%{python3_sitelib}/networkx/algorithms/community/tests/
-%{python3_sitelib}/networkx/algorithms/components/tests/
-%{python3_sitelib}/networkx/algorithms/connectivity/tests/
-%{python3_sitelib}/networkx/algorithms/flow/tests/
-%{python3_sitelib}/networkx/algorithms/isomorphism/tests/
-%{python3_sitelib}/networkx/algorithms/link_analysis/tests/
-%{python3_sitelib}/networkx/algorithms/node_classification/tests/
-%{python3_sitelib}/networkx/algorithms/operators/tests/
-%{python3_sitelib}/networkx/algorithms/shortest_paths/tests/
-%{python3_sitelib}/networkx/algorithms/tests/
-%{python3_sitelib}/networkx/algorithms/traversal/tests/
-%{python3_sitelib}/networkx/algorithms/tree/tests/
-%{python3_sitelib}/networkx/classes/tests/
-%{python3_sitelib}/networkx/drawing/tests/
-%{python3_sitelib}/networkx/generators/tests/
-%{python3_sitelib}/networkx/linalg/tests/
-%{python3_sitelib}/networkx/readwrite/json_graph/tests/
-%{python3_sitelib}/networkx/readwrite/tests/
-%{python3_sitelib}/networkx/tests/
-%{python3_sitelib}/networkx/utils/tests/
 
 %files doc
 %doc doc/build/html/*
 
 %changelog
+* Thu May 16 2019 Jerry James <loganjerry@gmail.com> - 2.3-2
+- Merge the -test subpackage back into the main package (bz 1708372)
+
 * Sat Apr 27 2019 Jerry James <loganjerry@gmail.com> - 2.3-1
 - New upstream version
 - Drop upstreamed -abc patch