diff --git a/python-stestr.spec b/python-stestr.spec
index f9bb198..3b4bc82 100644
--- a/python-stestr.spec
+++ b/python-stestr.spec
@@ -35,6 +35,21 @@ URL:            https://github.com/mtreinish/stestr
 Source:         https://files.pythonhosted.org/packages/source/s/stestr/stestr-%{version}.tar.gz
 BuildRequires:  %{python_module pbr >= 2.0.0}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
+BuildRequires:  python3-dbm
+Requires:       python-PyYAML >= 3.10.0
+Requires:       python-cliff >= 2.8.0
+Requires:       python-fixtures >= 3.0.0
+Requires:       python-future
+Requires:       python-pbr >= 2.0.0
+Requires:       python-python-subunit >= 1.3.0
+Requires:       python-six >= 1.10.0
+Requires:       python-testtools >= 2.2.0
+Requires:       python-voluptuous >= 0.8.9
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
+BuildArch:      noarch
 %if %{with test}
 BuildRequires:  %{python_module PyYAML >= 3.10.0}
 BuildRequires:  %{python_module SQLAlchemy}
@@ -51,28 +66,13 @@ BuildRequires:  %{python_module stestr >= %{version}}
 BuildRequires:  %{python_module testtools >= 2.2.0}
 BuildRequires:  %{python_module voluptuous >= 0.8.9}
 %endif
-BuildRequires:  fdupes
-BuildRequires:  python-rpm-macros
-BuildRequires:  python3-dbm
-Requires:       python-PyYAML >= 3.10.0
-Requires:       python-cliff >= 2.8.0
-Requires:       python-fixtures >= 3.0.0
-Requires:       python-future
-Requires:       python-pbr >= 2.0.0
-Requires:       python-python-subunit >= 1.3.0
-Requires:       python-six >= 1.10.0
-Requires:       python-testtools >= 2.2.0
-Requires:       python-voluptuous >= 0.8.9
 %ifpython3
 Requires:       python-dbm
 %endif
-Requires(post): update-alternatives
-Requires(postun): update-alternatives
 %if !0%{?_no_weakdeps}
 Recommends:     python-SQLAlchemy
 Recommends:     python-subunit2sql >= 1.8.0
 %endif
-BuildArch:      noarch
 %python_subpackages
 
 %description
@@ -91,7 +91,7 @@ rm stestr/tests/repository/test_sql.py
 %if %{with test}
 %check
 export LC_ALL="en_US.UTF8"
-%python_expand py.test-%{$python_bin_suffix} -v stestr/tests -k 'not test_empty_with_pretty_out'
+%pytest stestr/tests -k 'not test_empty_with_pretty_out'
 %endif
 
 %if ! %{with test}