diff --git a/python-nbconvert.spec b/python-nbconvert.spec
index e004279..1006385 100644
--- a/python-nbconvert.spec
+++ b/python-nbconvert.spec
@@ -17,10 +17,10 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%define doc_ver 5.4
 Name:           python-nbconvert
 Version:        5.5.0
 Release:        0
-%define doc_ver 5.4
 Summary:        Conversion of Jupyter Notebooks
 License:        BSD-3-Clause
 Group:          Development/Languages/Python
@@ -28,29 +28,30 @@ URL:            https://github.com/jupyter/nbconvert
 Source0:        https://files.pythonhosted.org/packages/source/n/nbconvert/nbconvert-%{version}.tar.gz
 Source1:        https://media.readthedocs.org/pdf/nbconvert/%{doc_ver}/nbconvert.pdf
 Source2:        https://media.readthedocs.org/htmlzip/nbconvert/%{doc_ver}/nbconvert.zip
-BuildRequires:  %{python_module setuptools}
-BuildRequires:  fdupes
-BuildRequires:  python-rpm-macros
-BuildRequires:  unzip
 # Test requirements
 BuildRequires:  %{python_module Jinja2}
 BuildRequires:  %{python_module Pygments}
 BuildRequires:  %{python_module bleach}
 BuildRequires:  %{python_module defusedxml}
 BuildRequires:  %{python_module entrypoints >= 0.2.2}
-BuildRequires:  %{python_module jupyter_client >= 4.2}
-BuildRequires:  %{python_module jupyter_core}
 BuildRequires:  %{python_module ipykernel}
 BuildRequires:  %{python_module ipywidgets}
-BuildRequires:  %{python_module nbformat >= 4.4}
+BuildRequires:  %{python_module jupyter_client >= 4.2}
+BuildRequires:  %{python_module jupyter_core}
 BuildRequires:  %{python_module mistune >= 0.7.4}
 BuildRequires:  %{python_module mock}
+BuildRequires:  %{python_module nbformat >= 4.4}
 BuildRequires:  %{python_module nose}
 BuildRequires:  %{python_module pandocfilters >= 1.4.1}
 BuildRequires:  %{python_module pytest}
+BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module testpath}
 BuildRequires:  %{python_module tornado >= 4.0}
 BuildRequires:  %{python_module traitlets >= 4.2}
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
+BuildRequires:  unzip
+Requires:       jupyter-nbconvert = %{version}
 # Python 2 test requirements
 Requires:       python-Jinja2
 Requires:       python-Pygments
@@ -58,8 +59,8 @@ Requires:       python-bleach
 Requires:       python-defusedxml
 Requires:       python-entrypoints >= 0.2.2
 Requires:       python-jupyter_core
-Requires:       python-nbformat >= 4.4
 Requires:       python-mistune >= 0.7.4
+Requires:       python-nbformat >= 4.4
 Requires:       python-pandocfilters >= 1.4.1
 Requires:       python-testpath
 Requires:       python-traitlets >= 4.2
@@ -69,7 +70,6 @@ Recommends:     python-tornado >= 4.0
 Suggests:       %{name}-latex
 Provides:       python-jupyter_nbconvert = %{version}
 Obsoletes:      python-jupyter_nbconvert < %{version}
-Requires:       jupyter-nbconvert = %{version}
 BuildArch:      noarch
 %python_subpackages
 
@@ -81,11 +81,11 @@ This package provides the python interface.
 
 %package     -n jupyter-nbconvert
 Summary:        Conversion of Jupyter Notebooks
-Requires:       python3-nbconvert = %{version}
+Requires:       jupyter-ipykernel
 Requires:       jupyter-jupyter_client >= 4.2
 Requires:       jupyter-jupyter_core
-Requires:       jupyter-ipykernel
 Requires:       jupyter-nbformat >= 4.4
+Requires:       python3-nbconvert = %{version}
 
 %description -n jupyter-nbconvert
 The jupyter nbconvert package converts notebooks to various other formats