diff --git a/openstack/automaton/automaton.spec.j2 b/openstack/automaton/automaton.spec.j2
index 446d4626a..739902c2f 100644
--- a/openstack/automaton/automaton.spec.j2
+++ b/openstack/automaton/automaton.spec.j2
@@ -58,7 +58,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %doc README.rst
diff --git a/openstack/castellan/castellan.spec.j2 b/openstack/castellan/castellan.spec.j2
index 71df20e6b..f9c44c5cc 100644
--- a/openstack/castellan/castellan.spec.j2
+++ b/openstack/castellan/castellan.spec.j2
@@ -75,7 +75,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-castellan
 %license LICENSE
diff --git a/openstack/debtcollector/debtcollector.spec.j2 b/openstack/debtcollector/debtcollector.spec.j2
index 0fe981946..a1d25ef1c 100644
--- a/openstack/debtcollector/debtcollector.spec.j2
+++ b/openstack/debtcollector/debtcollector.spec.j2
@@ -82,7 +82,7 @@ PBR_VERSION={{ upstream_version }} %sphinx_build -b html doc/source doc/build/ht
 rm -rf doc/build/html/.{doctrees,buildinfo}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %install
 %py3_install
diff --git a/openstack/freezer-api/freezer-api.spec.j2 b/openstack/freezer-api/freezer-api.spec.j2
index 893d01787..6e08d6331 100644
--- a/openstack/freezer-api/freezer-api.spec.j2
+++ b/openstack/freezer-api/freezer-api.spec.j2
@@ -132,7 +132,7 @@ install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/openstack
 %openstack_pre_user_group_create freezer freezer /sbin/nologin
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files
 %license LICENSE
diff --git a/openstack/futurist/futurist.spec.j2 b/openstack/futurist/futurist.spec.j2
index aa837f7e2..87499dfde 100644
--- a/openstack/futurist/futurist.spec.j2
+++ b/openstack/futurist/futurist.spec.j2
@@ -49,7 +49,7 @@ rm -r doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %doc doc/build/html README.rst
diff --git a/openstack/glance_store/glance_store.spec.j2 b/openstack/glance_store/glance_store.spec.j2
index fbcb1366f..388b6f12e 100644
--- a/openstack/glance_store/glance_store.spec.j2
+++ b/openstack/glance_store/glance_store.spec.j2
@@ -95,7 +95,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 mv %{buildroot}/%{_prefix}/%{_sysconfdir} %{buildroot}/%{_sysconfdir}
 
 %check
-PYTHON=python3 PYTHONPATH="." python3 -m stestr.cli run
+PYTHON=python3 PYTHONPATH="." %{openstack_stestr_run}
 
 %pre
 %openstack_pre_user_group_create glance glance /sbin/nologin
diff --git a/openstack/ironic-inspector/ironic-inspector.spec.j2 b/openstack/ironic-inspector/ironic-inspector.spec.j2
index 15a50febe..61ee65351 100644
--- a/openstack/ironic-inspector/ironic-inspector.spec.j2
+++ b/openstack/ironic-inspector/ironic-inspector.spec.j2
@@ -245,7 +245,7 @@ install -p -D -m 644 doc/build/man/ironic-inspector.1 %{buildroot}%{_mandir}/man
 
 %check
 export LC_ALL=en_US.UTF-8
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %pre
 %openstack_pre_user_group_create ironic-inspector ironic-inspector /sbin/nologin
diff --git a/openstack/ironic-lib/ironic-lib.spec.j2 b/openstack/ironic-lib/ironic-lib.spec.j2
index 6ad258f11..5b95e8e53 100644
--- a/openstack/ironic-lib/ironic-lib.spec.j2
+++ b/openstack/ironic-lib/ironic-lib.spec.j2
@@ -53,7 +53,7 @@ governance <https://governance.openstack.org/tc/reference/projects/ironic.html>`
 %{py3_build}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %install
 %{py3_install}
diff --git a/openstack/ironic/ironic.spec.j2 b/openstack/ironic/ironic.spec.j2
index 77d4ce3ef..4dfd6e435 100644
--- a/openstack/ironic/ironic.spec.j2
+++ b/openstack/ironic/ironic.spec.j2
@@ -240,7 +240,7 @@ install -p -D -m 644 doc/build/man/*.1 %{buildroot}%{_mandir}/man1/
 
 %check
 export LC_ALL=en_US.UTF-8
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %pre
 %openstack_pre_user_group_create ironic ironic /sbin/nologin
diff --git a/openstack/keystoneauth1/keystoneauth1.spec.j2 b/openstack/keystoneauth1/keystoneauth1.spec.j2
index 994ddacb6..9066ca0e2 100644
--- a/openstack/keystoneauth1/keystoneauth1.spec.j2
+++ b/openstack/keystoneauth1/keystoneauth1.spec.j2
@@ -86,7 +86,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 
 %check
 rm -v keystoneauth1/tests/unit/test_hacking_checks.py
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/keystonemiddleware/keystonemiddleware.spec.j2 b/openstack/keystonemiddleware/keystonemiddleware.spec.j2
index 7912ba212..25d7d043f 100644
--- a/openstack/keystonemiddleware/keystonemiddleware.spec.j2
+++ b/openstack/keystonemiddleware/keystonemiddleware.spec.j2
@@ -95,7 +95,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 
 %check
 rm -v keystonemiddleware/tests/unit/audit/test_logging_notifier.py
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-keystonemiddleware
 %license LICENSE
diff --git a/openstack/magnum/magnum.spec.j2 b/openstack/magnum/magnum.spec.j2
index c21d6e0a4..8118b3db8 100644
--- a/openstack/magnum/magnum.spec.j2
+++ b/openstack/magnum/magnum.spec.j2
@@ -246,7 +246,7 @@ rm magnum/tests/unit/test_hacking.py
 
 export LC_ALL=en_US.UTF-8
 export EDITOR=/bin/true
-python3 -m stestr.cli run --concurrency 1
+%{openstack_stestr_run} --concurrency 1
 
 %post api
 %systemd_post %{name}-api.service
diff --git a/openstack/metalsmith/metalsmith.spec.j2 b/openstack/metalsmith/metalsmith.spec.j2
index d7a625c94..f7a3b5413 100644
--- a/openstack/metalsmith/metalsmith.spec.j2
+++ b/openstack/metalsmith/metalsmith.spec.j2
@@ -70,7 +70,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-metalsmith
 %license LICENSE
diff --git a/openstack/microversion_parse/microversion_parse.spec.j2 b/openstack/microversion_parse/microversion_parse.spec.j2
index c1a855875..6b55595c2 100644
--- a/openstack/microversion_parse/microversion_parse.spec.j2
+++ b/openstack/microversion_parse/microversion_parse.spec.j2
@@ -54,7 +54,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %check
 # requires gabbi
 rm -v microversion_parse/tests/test_middleware.py
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/mistral-lib/mistral-lib.spec.j2 b/openstack/mistral-lib/mistral-lib.spec.j2
index 516be1893..35a83fdfd 100644
--- a/openstack/mistral-lib/mistral-lib.spec.j2
+++ b/openstack/mistral-lib/mistral-lib.spec.j2
@@ -57,7 +57,7 @@ This package contains the Python 3.x module.
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-mistral-lib
 %license LICENSE
diff --git a/openstack/monasca-agent/monasca-agent.spec.j2 b/openstack/monasca-agent/monasca-agent.spec.j2
index a2bd24424..16577f76d 100644
--- a/openstack/monasca-agent/monasca-agent.spec.j2
+++ b/openstack/monasca-agent/monasca-agent.spec.j2
@@ -177,7 +177,7 @@ install -D -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/polkit-1/rules.d/49-mona
 %check
 find . -type f -name *.pyc -delete
 find . -type f -name '*test_service_plugin.py' -delete
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files
 %dir %attr(-, root, monasca) %{_sysconfdir}/monasca
diff --git a/openstack/monasca-common/monasca-common.spec.j2 b/openstack/monasca-common/monasca-common.spec.j2
index 39d6e8bed..1d78d9731 100644
--- a/openstack/monasca-common/monasca-common.spec.j2
+++ b/openstack/monasca-common/monasca-common.spec.j2
@@ -65,7 +65,7 @@ export LC_ALL=en_US.utf-8
 #%if 0%{?suse_version}
 %check
 export LC_ALL=en_US.utf-8
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 #%endif
 
 %files -n python3-monasca-common
diff --git a/openstack/monasca-persister/monasca-persister.spec.j2 b/openstack/monasca-persister/monasca-persister.spec.j2
index 06442cee3..5229c9989 100644
--- a/openstack/monasca-persister/monasca-persister.spec.j2
+++ b/openstack/monasca-persister/monasca-persister.spec.j2
@@ -96,7 +96,7 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/openstack-monasca-persister.logrotate
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %pre
 %openstack_pre_user_group_create monasca-persister monasca /sbin/nologin
diff --git a/openstack/monasca-statsd/monasca-statsd.spec.j2 b/openstack/monasca-statsd/monasca-statsd.spec.j2
index 5ac765240..dcbc93f64 100644
--- a/openstack/monasca-statsd/monasca-statsd.spec.j2
+++ b/openstack/monasca-statsd/monasca-statsd.spec.j2
@@ -43,7 +43,7 @@ export LC_ALL=en_US.utf-8
 
 %check
 export LC_ALL=en_US.utf-8
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-monasca-statsd
 %license LICENSE
diff --git a/openstack/neutron-lib/neutron-lib.spec.j2 b/openstack/neutron-lib/neutron-lib.spec.j2
index 7eb44fd80..59290e2a8 100644
--- a/openstack/neutron-lib/neutron-lib.spec.j2
+++ b/openstack/neutron-lib/neutron-lib.spec.j2
@@ -103,7 +103,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %check
 # we don't want to depend on hacking
 rm -rf neutron_lib/tests/unit/hacking
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/openstack-macros/macros.openstack-common b/openstack/openstack-macros/macros.openstack-common
index 49d6f7b76..b9683b4f9 100644
--- a/openstack/openstack-macros/macros.openstack-common
+++ b/openstack/openstack-macros/macros.openstack-common
@@ -26,6 +26,7 @@ CFLAGS="%{optflags}" %{__python2} %{py_setup} %{?py_setup_args} install -O1 --sk
 #
 # OpenStack macros
 #
+%openstack_stestr_run %{__python3} -m stestr.cli run
 
 # the directory where the test files will be installed
 %openstack_test_package_dir %{_localstatedir}/lib/%{name}-test
diff --git a/openstack/openstack-macros/openstack-macros.spec.j2 b/openstack/openstack-macros/openstack-macros.spec.j2
index 0f01d4162..346db7b25 100644
--- a/openstack/openstack-macros/openstack-macros.spec.j2
+++ b/openstack/openstack-macros/openstack-macros.spec.j2
@@ -6,7 +6,7 @@
 %endif
 %endif
 Name:           openstack-macros
-Version:        2021.1.0
+Version:        2023.1.0
 Release:        0
 Summary:        OpenStack Packaging - RPM Macros
 License:        {{ license('Apache-2.0') }}
diff --git a/openstack/openstacksdk/openstacksdk.spec.j2 b/openstack/openstacksdk/openstacksdk.spec.j2
index 3aceab904..d5003e839 100644
--- a/openstack/openstacksdk/openstacksdk.spec.j2
+++ b/openstack/openstacksdk/openstacksdk.spec.j2
@@ -130,7 +130,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %check
 export OS_LOG_CAPTURE=true
 export OS_TEST_TIMEOUT=30
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 %endif
 
 %files -n {{ py2name(py_versions='py3') }}
diff --git a/openstack/os-api-ref/os-api-ref.spec.j2 b/openstack/os-api-ref/os-api-ref.spec.j2
index 21c60f135..f5246b8c1 100644
--- a/openstack/os-api-ref/os-api-ref.spec.j2
+++ b/openstack/os-api-ref/os-api-ref.spec.j2
@@ -68,7 +68,7 @@ This package contains the Python 3.x module.
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/os-apply-config/os-apply-config.spec.j2 b/openstack/os-apply-config/os-apply-config.spec.j2
index f29038d07..06a5d8c07 100644
--- a/openstack/os-apply-config/os-apply-config.spec.j2
+++ b/openstack/os-apply-config/os-apply-config.spec.j2
@@ -42,7 +42,7 @@ sed -i 's#%{_bindir}/env python$#%{_bindir}/python3#g' os_apply_config/tests/tem
 install -d -m 755 %{buildroot}%{_libexecdir}/os-apply-config/templates
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files
 %license LICENSE
diff --git a/openstack/os-brick/os-brick.spec.j2 b/openstack/os-brick/os-brick.spec.j2
index 7bae805dd..b030a2139 100644
--- a/openstack/os-brick/os-brick.spec.j2
+++ b/openstack/os-brick/os-brick.spec.j2
@@ -104,7 +104,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 mv %{buildroot}%{_prefix}%{_sysconfdir}/* %{buildroot}/%{_sysconfdir}/
 
 %check
-python3 -m stestr.cli run --concurrency=1
+%{openstack_stestr_run} --concurrency=1
 
 %files -n python3-os-brick
 %license LICENSE
diff --git a/openstack/os-client-config/os-client-config.spec.j2 b/openstack/os-client-config/os-client-config.spec.j2
index 7cc9fffe5..4e6975720 100644
--- a/openstack/os-client-config/os-client-config.spec.j2
+++ b/openstack/os-client-config/os-client-config.spec.j2
@@ -84,7 +84,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %if %{with test}
 %check
 export PYTHONPATH="%{python3_sitearch}:%{python3_sitelib}:%{buildroot}%{python3_sitelib}"
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 %endif
 
 %files -n {{ py2name(py_versions='py3') }}
diff --git a/openstack/os-collect-config/os-collect-config.spec.j2 b/openstack/os-collect-config/os-collect-config.spec.j2
index 9596beb84..a7649a089 100644
--- a/openstack/os-collect-config/os-collect-config.spec.j2
+++ b/openstack/os-collect-config/os-collect-config.spec.j2
@@ -67,7 +67,7 @@ install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/os-collect-config.con
 mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/local-data
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %post
 %systemd_post os-collect-config.service
diff --git a/openstack/os-ken/os-ken.spec.j2 b/openstack/os-ken/os-ken.spec.j2
index b4c57d049..076501b00 100644
--- a/openstack/os-ken/os-ken.spec.j2
+++ b/openstack/os-ken/os-ken.spec.j2
@@ -73,7 +73,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %doc README.rst ChangeLog
diff --git a/openstack/os-refresh-config/os-refresh-config.spec.j2 b/openstack/os-refresh-config/os-refresh-config.spec.j2
index e3643c590..5eb57503e 100644
--- a/openstack/os-refresh-config/os-refresh-config.spec.j2
+++ b/openstack/os-refresh-config/os-refresh-config.spec.j2
@@ -45,7 +45,7 @@ install -d -m 755 %{buildroot}%{_libexecdir}/os-refresh-config/post-configure.d
 # NOTE(jpena): os_refresh_config.py has a wrong shebang, and it is called
 # directly by the tests.
 sed -i 's/#!\/usr\/bin\/env.*/#!\/usr\/bin\/python3/' os_refresh_config/os_refresh_config.py
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files
 %license LICENSE
diff --git a/openstack/os-resource-classes/os-resource-classes.spec.j2 b/openstack/os-resource-classes/os-resource-classes.spec.j2
index e83dd0b55..cf3a0ba0c 100644
--- a/openstack/os-resource-classes/os-resource-classes.spec.j2
+++ b/openstack/os-resource-classes/os-resource-classes.spec.j2
@@ -82,7 +82,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %doc README.rst ChangeLog
diff --git a/openstack/os-service-types/os-service-types.spec.j2 b/openstack/os-service-types/os-service-types.spec.j2
index b20369492..a09ee1b65 100644
--- a/openstack/os-service-types/os-service-types.spec.j2
+++ b/openstack/os-service-types/os-service-types.spec.j2
@@ -77,7 +77,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 
 %check
 export OS_TEST_PATH=os_service_types/tests
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/os-traits/os-traits.spec.j2 b/openstack/os-traits/os-traits.spec.j2
index 3d7568937..5a6892d07 100644
--- a/openstack/os-traits/os-traits.spec.j2
+++ b/openstack/os-traits/os-traits.spec.j2
@@ -65,7 +65,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %doc README.rst ChangeLog
diff --git a/openstack/os-vif/os-vif.spec.j2 b/openstack/os-vif/os-vif.spec.j2
index ae0938711..18e34f7a7 100644
--- a/openstack/os-vif/os-vif.spec.j2
+++ b/openstack/os-vif/os-vif.spec.j2
@@ -90,7 +90,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 
 %check
 export OS_TEST_PATH="os_vif/tests/unit"
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-os-vif
 %license LICENSE
diff --git a/openstack/os-win/os-win.spec.j2 b/openstack/os-win/os-win.spec.j2
index 593f2e112..3ac936a00 100644
--- a/openstack/os-win/os-win.spec.j2
+++ b/openstack/os-win/os-win.spec.j2
@@ -76,7 +76,7 @@ rm -rf doc/build/man/.{doctrees,buildinfo}
 install -p -D -m 644 doc/build/man/os-win.1 %{buildroot}/%{_mandir}/man1/os-win.1
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %doc README.rst ChangeLog
diff --git a/openstack/osc-lib/osc-lib.spec.j2 b/openstack/osc-lib/osc-lib.spec.j2
index e92c75d23..df8f8d1f6 100644
--- a/openstack/osc-lib/osc-lib.spec.j2
+++ b/openstack/osc-lib/osc-lib.spec.j2
@@ -77,7 +77,7 @@ PBR_VERSION=%{version} PYTHONPATH=. %sphinx_build -a -E -d doc/build/doctrees -b
 rm -rf doc/build/html/.{doctrees,buildinfo}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/oslo.cache/oslo.cache.spec.j2 b/openstack/oslo.cache/oslo.cache.spec.j2
index f0e0e9089..7204b2eee 100644
--- a/openstack/oslo.cache/oslo.cache.spec.j2
+++ b/openstack/oslo.cache/oslo.cache.spec.j2
@@ -71,7 +71,7 @@ PBR_VERSION={{ upstream_version }} %sphinx_build -b html doc/source doc/build/ht
 rm -rf doc/build/html/.{doctrees,buildinfo}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/oslo.concurrency/oslo.concurrency.spec.j2 b/openstack/oslo.concurrency/oslo.concurrency.spec.j2
index 716145daa..84a2cf3ee 100644
--- a/openstack/oslo.concurrency/oslo.concurrency.spec.j2
+++ b/openstack/oslo.concurrency/oslo.concurrency.spec.j2
@@ -75,7 +75,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/oslo.config/oslo.config.spec.j2 b/openstack/oslo.config/oslo.config.spec.j2
index a89002d11..df676a81c 100644
--- a/openstack/oslo.config/oslo.config.spec.j2
+++ b/openstack/oslo.config/oslo.config.spec.j2
@@ -91,7 +91,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %check
 # Requires oslo.log which we can't depend on for build cycle reasons
 rm -v oslo_config/tests/test_cfg.py
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/oslo.context/oslo.context.spec.j2 b/openstack/oslo.context/oslo.context.spec.j2
index e20b54bae..013105012 100644
--- a/openstack/oslo.context/oslo.context.spec.j2
+++ b/openstack/oslo.context/oslo.context.spec.j2
@@ -65,7 +65,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 
 %if %{with test}
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 %endif
 
 %files -n {{ py2name(py_versions='py3') }}
diff --git a/openstack/oslo.db/oslo.db.spec.j2 b/openstack/oslo.db/oslo.db.spec.j2
index e5978c7fa..d6c899de7 100644
--- a/openstack/oslo.db/oslo.db.spec.j2
+++ b/openstack/oslo.db/oslo.db.spec.j2
@@ -93,7 +93,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/oslo.i18n/oslo.i18n.spec.j2 b/openstack/oslo.i18n/oslo.i18n.spec.j2
index cde957a29..dcc2ab0f0 100644
--- a/openstack/oslo.i18n/oslo.i18n.spec.j2
+++ b/openstack/oslo.i18n/oslo.i18n.spec.j2
@@ -58,7 +58,7 @@ PBR_VERSION=%{version} %sphinx_build -b html doc/source doc/build/html
 rm -rf doc/build/html/.{doctrees,buildinfo}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/oslo.limit/oslo.limit.spec.j2 b/openstack/oslo.limit/oslo.limit.spec.j2
index 0580a43e9..c0fea33ba 100644
--- a/openstack/oslo.limit/oslo.limit.spec.j2
+++ b/openstack/oslo.limit/oslo.limit.spec.j2
@@ -64,7 +64,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/oslo.log/oslo.log.spec.j2 b/openstack/oslo.log/oslo.log.spec.j2
index 9bc471122..8694ebca8 100644
--- a/openstack/oslo.log/oslo.log.spec.j2
+++ b/openstack/oslo.log/oslo.log.spec.j2
@@ -77,7 +77,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/oslo.messaging/oslo.messaging.spec.j2 b/openstack/oslo.messaging/oslo.messaging.spec.j2
index a07dd0698..8fb30046e 100644
--- a/openstack/oslo.messaging/oslo.messaging.spec.j2
+++ b/openstack/oslo.messaging/oslo.messaging.spec.j2
@@ -105,7 +105,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 # fail without it
 rm -rf oslo_messaging/tests/functional
 # 3 cyrus tests fail on rdo with time out
-python3 -m stestr.cli run --black-regex '^oslo_messaging.tests.(functional|drivers.test_amqp_driver.TestCyrusAuthentication.test_authentication_(ok|ignore_default_realm|default_realm))'
+%{openstack_stestr_run} --black-regex '^oslo_messaging.tests.(functional|drivers.test_amqp_driver.TestCyrusAuthentication.test_authentication_(ok|ignore_default_realm|default_realm))'
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/oslo.metrics/oslo.metrics.spec.j2 b/openstack/oslo.metrics/oslo.metrics.spec.j2
index b3fe119bf..fd34379c4 100644
--- a/openstack/oslo.metrics/oslo.metrics.spec.j2
+++ b/openstack/oslo.metrics/oslo.metrics.spec.j2
@@ -65,7 +65,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 
 %check
 export PYTHONPATH=`pwd`
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/oslo.middleware/oslo.middleware.spec.j2 b/openstack/oslo.middleware/oslo.middleware.spec.j2
index f232eafb9..8f50cfa52 100644
--- a/openstack/oslo.middleware/oslo.middleware.spec.j2
+++ b/openstack/oslo.middleware/oslo.middleware.spec.j2
@@ -87,7 +87,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %py3_install
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/oslo.policy/oslo.policy.spec.j2 b/openstack/oslo.policy/oslo.policy.spec.j2
index 43d0e8861..41af69f10 100644
--- a/openstack/oslo.policy/oslo.policy.spec.j2
+++ b/openstack/oslo.policy/oslo.policy.spec.j2
@@ -75,7 +75,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files  -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/oslo.reports/oslo.reports.spec.j2 b/openstack/oslo.reports/oslo.reports.spec.j2
index a749eda93..c7712ef1f 100644
--- a/openstack/oslo.reports/oslo.reports.spec.j2
+++ b/openstack/oslo.reports/oslo.reports.spec.j2
@@ -68,7 +68,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/oslo.rootwrap/oslo.rootwrap.spec.j2 b/openstack/oslo.rootwrap/oslo.rootwrap.spec.j2
index e9d8d90c4..1439c886b 100644
--- a/openstack/oslo.rootwrap/oslo.rootwrap.spec.j2
+++ b/openstack/oslo.rootwrap/oslo.rootwrap.spec.j2
@@ -65,7 +65,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 
 %check
 export PYTHONPATH=.
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/oslo.serialization/oslo.serialization.spec.j2 b/openstack/oslo.serialization/oslo.serialization.spec.j2
index e47aa0ce8..0941bbd13 100644
--- a/openstack/oslo.serialization/oslo.serialization.spec.j2
+++ b/openstack/oslo.serialization/oslo.serialization.spec.j2
@@ -64,7 +64,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/oslo.service/oslo.service.spec.j2 b/openstack/oslo.service/oslo.service.spec.j2
index 01b259418..9824df5c7 100644
--- a/openstack/oslo.service/oslo.service.spec.j2
+++ b/openstack/oslo.service/oslo.service.spec.j2
@@ -91,7 +91,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/oslo.upgradecheck/oslo.upgradecheck.spec.j2 b/openstack/oslo.upgradecheck/oslo.upgradecheck.spec.j2
index 83b935b37..492173e24 100644
--- a/openstack/oslo.upgradecheck/oslo.upgradecheck.spec.j2
+++ b/openstack/oslo.upgradecheck/oslo.upgradecheck.spec.j2
@@ -73,7 +73,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 
 %check
 export PYTHONPATH=`pwd`
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/oslo.utils/oslo.utils.spec.j2 b/openstack/oslo.utils/oslo.utils.spec.j2
index a8c73b4a8..89963b3b5 100644
--- a/openstack/oslo.utils/oslo.utils.spec.j2
+++ b/openstack/oslo.utils/oslo.utils.spec.j2
@@ -77,7 +77,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %check
 # tests fail with python 3.8
 rm -v oslo_utils/tests/test_reflection.py
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/oslo.versionedobjects/oslo.versionedobjects.spec.j2 b/openstack/oslo.versionedobjects/oslo.versionedobjects.spec.j2
index c39de2708..260a72e92 100644
--- a/openstack/oslo.versionedobjects/oslo.versionedobjects.spec.j2
+++ b/openstack/oslo.versionedobjects/oslo.versionedobjects.spec.j2
@@ -82,7 +82,7 @@ rm -r doc/build/html/.{doctrees,buildinfo}
 %py3_install
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/oslo.vmware/oslo.vmware.spec.j2 b/openstack/oslo.vmware/oslo.vmware.spec.j2
index 285f387b0..37ddd4a0c 100644
--- a/openstack/oslo.vmware/oslo.vmware.spec.j2
+++ b/openstack/oslo.vmware/oslo.vmware.spec.j2
@@ -92,7 +92,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %check
 # don't want to depend on hacking for package building
 rm oslo_vmware/tests/test_hacking.py
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %doc README.rst
diff --git a/openstack/oslotest/oslotest.spec.j2 b/openstack/oslotest/oslotest.spec.j2
index f45699419..633b4f6ca 100644
--- a/openstack/oslotest/oslotest.spec.j2
+++ b/openstack/oslotest/oslotest.spec.j2
@@ -51,7 +51,7 @@ This package contains the Python 3.x module.
 %py3_install
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/osprofiler/osprofiler.spec.j2 b/openstack/osprofiler/osprofiler.spec.j2
index 9bbbdb96a..b004695a7 100644
--- a/openstack/osprofiler/osprofiler.spec.j2
+++ b/openstack/osprofiler/osprofiler.spec.j2
@@ -87,7 +87,7 @@ PBR_VERSION=%{version} %sphinx_build -b html doc/source doc/build/html
 rm -rf doc/build/html/.{doctrees,buildinfo}
 
 %check
-python3 -m stestr.cli run --black-regex '(^osprofiler.tests.unit.drivers.test_jaeger.JaegerTestCase.*$)'
+%{openstack_stestr_run} --black-regex '(^osprofiler.tests.unit.drivers.test_jaeger.JaegerTestCase.*$)'
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/ovsdbapp/ovsdbapp.spec.j2 b/openstack/ovsdbapp/ovsdbapp.spec.j2
index 6921c960b..8ebb9cf17 100644
--- a/openstack/ovsdbapp/ovsdbapp.spec.j2
+++ b/openstack/ovsdbapp/ovsdbapp.spec.j2
@@ -65,7 +65,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 
 %if 0%{?with_tests}
 %check
-OS_TEST_PATH=./ovsdbapp/tests/unit PYTHONPATH=. python3 -m stestr.cli run
+OS_TEST_PATH=./ovsdbapp/tests/unit PYTHONPATH=. %{openstack_stestr_run}
 %endif
 
 %files -n {{ py2name(py_versions='py3') }}
diff --git a/openstack/pycadf/pycadf.spec.j2 b/openstack/pycadf/pycadf.spec.j2
index 3ea3ce31b..47831d55e 100644
--- a/openstack/pycadf/pycadf.spec.j2
+++ b/openstack/pycadf/pycadf.spec.j2
@@ -72,7 +72,7 @@ mkdir -p %{buildroot}/%{_sysconfdir}
 mv %{buildroot}%{_prefix}%{_sysconfdir}/{{ pypi_name }} %{buildroot}/%{_sysconfdir}/
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %doc README.rst
diff --git a/openstack/pyghmi/pyghmi.spec.j2 b/openstack/pyghmi/pyghmi.spec.j2
index 0016fde58..d6d6c7c73 100644
--- a/openstack/pyghmi/pyghmi.spec.j2
+++ b/openstack/pyghmi/pyghmi.spec.j2
@@ -67,7 +67,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %doc README.md ChangeLog
diff --git a/openstack/pymod2pkg/pymod2pkg.spec.j2 b/openstack/pymod2pkg/pymod2pkg.spec.j2
index 6cbe480e4..9ede35449 100644
--- a/openstack/pymod2pkg/pymod2pkg.spec.j2
+++ b/openstack/pymod2pkg/pymod2pkg.spec.j2
@@ -61,7 +61,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/python-barbicanclient/python-barbicanclient.spec.j2 b/openstack/python-barbicanclient/python-barbicanclient.spec.j2
index 0d6cf0654..46b60e8e4 100644
--- a/openstack/python-barbicanclient/python-barbicanclient.spec.j2
+++ b/openstack/python-barbicanclient/python-barbicanclient.spec.j2
@@ -85,7 +85,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run \
+%{openstack_stestr_run} \
     --black-regex 'barbicanclient.tests.test_barbican.WhenTestingBarbicanCLI.test_should_show_usage_with_help_flag'
 
 %files -n python3-barbicanclient
diff --git a/openstack/python-cinderclient/python-cinderclient.spec.j2 b/openstack/python-cinderclient/python-cinderclient.spec.j2
index f6c43c429..35de2dfca 100644
--- a/openstack/python-cinderclient/python-cinderclient.spec.j2
+++ b/openstack/python-cinderclient/python-cinderclient.spec.j2
@@ -85,7 +85,7 @@ install -p -D -m 644 tools/cinder.bash_completion %{buildroot}%{_sysconfdir}/bas
 
 %check
 rm cinderclient/tests/unit/test_shell.py
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/python-cloudkittyclient/python-cloudkittyclient.spec.j2 b/openstack/python-cloudkittyclient/python-cloudkittyclient.spec.j2
index d90add24b..ddf164179 100644
--- a/openstack/python-cloudkittyclient/python-cloudkittyclient.spec.j2
+++ b/openstack/python-cloudkittyclient/python-cloudkittyclient.spec.j2
@@ -90,7 +90,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-cloudkittyclient
 %doc README.rst
diff --git a/openstack/python-designateclient/python-designateclient.spec.j2 b/openstack/python-designateclient/python-designateclient.spec.j2
index 60f5e66ea..96a5962eb 100644
--- a/openstack/python-designateclient/python-designateclient.spec.j2
+++ b/openstack/python-designateclient/python-designateclient.spec.j2
@@ -69,7 +69,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %py3_install
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-designateclient
 %license LICENSE
diff --git a/openstack/python-freezerclient/python-freezerclient.spec.j2 b/openstack/python-freezerclient/python-freezerclient.spec.j2
index 962ddd4a4..0c91cefdd 100644
--- a/openstack/python-freezerclient/python-freezerclient.spec.j2
+++ b/openstack/python-freezerclient/python-freezerclient.spec.j2
@@ -71,7 +71,7 @@ rm -r doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-freezerclient
 %doc README.rst
diff --git a/openstack/python-glanceclient/python-glanceclient.spec.j2 b/openstack/python-glanceclient/python-glanceclient.spec.j2
index 5844a1fd3..938710ce6 100644
--- a/openstack/python-glanceclient/python-glanceclient.spec.j2
+++ b/openstack/python-glanceclient/python-glanceclient.spec.j2
@@ -87,7 +87,7 @@ rm -rf doc/build/man/.{doctrees,buildinfo}
 install -p -D -m 644 doc/build/man/glance.1 %{buildroot}%{_mandir}/man1/glance.1
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/python-heatclient/python-heatclient.spec.j2 b/openstack/python-heatclient/python-heatclient.spec.j2
index a3d4fdc49..20baeb98c 100644
--- a/openstack/python-heatclient/python-heatclient.spec.j2
+++ b/openstack/python-heatclient/python-heatclient.spec.j2
@@ -98,7 +98,7 @@ install -p -D -m 644 doc/build/man/heat.1 %{buildroot}%{_mandir}/man1/heat.1
 install -p -D -m 644 tools/heat.bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/heat.bash_completion
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-heatclient
 %license LICENSE
diff --git a/openstack/python-ironicclient/python-ironicclient.spec.j2 b/openstack/python-ironicclient/python-ironicclient.spec.j2
index 2b7c6cb5f..fda8c57d3 100644
--- a/openstack/python-ironicclient/python-ironicclient.spec.j2
+++ b/openstack/python-ironicclient/python-ironicclient.spec.j2
@@ -89,7 +89,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-ironicclient
 %license LICENSE
diff --git a/openstack/python-keystoneclient/python-keystoneclient.spec.j2 b/openstack/python-keystoneclient/python-keystoneclient.spec.j2
index 7343dd741..16ba13ec4 100644
--- a/openstack/python-keystoneclient/python-keystoneclient.spec.j2
+++ b/openstack/python-keystoneclient/python-keystoneclient.spec.j2
@@ -75,7 +75,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %doc README.rst
diff --git a/openstack/python-magnumclient/python-magnumclient.spec.j2 b/openstack/python-magnumclient/python-magnumclient.spec.j2
index dd0af60e5..2d10d8164 100644
--- a/openstack/python-magnumclient/python-magnumclient.spec.j2
+++ b/openstack/python-magnumclient/python-magnumclient.spec.j2
@@ -94,7 +94,7 @@ install -p -D -m 644 doc/build/man/python-magnumclient.1 %{buildroot}%{_mandir}/
 install -p -D -m 644 tools/magnum.bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/magnum.bash_completion
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-magnumclient
 %license LICENSE
diff --git a/openstack/python-manilaclient/python-manilaclient.spec.j2 b/openstack/python-manilaclient/python-manilaclient.spec.j2
index 616fbd73e..564e0efc6 100644
--- a/openstack/python-manilaclient/python-manilaclient.spec.j2
+++ b/openstack/python-manilaclient/python-manilaclient.spec.j2
@@ -84,7 +84,7 @@ install -p -D -m 644 tools/manila.bash_completion %{buildroot}%{_sysconfdir}/bas
 rm -f manilaclient/tests/unit/test_shell.py
 rm -f manilaclient/tests/unit/test_functional_utils.py
 rm -rf manilaclient/tests/functional
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-manilaclient
 %doc README.rst
diff --git a/openstack/python-masakariclient/python-masakariclient.spec.j2 b/openstack/python-masakariclient/python-masakariclient.spec.j2
index b37ea8c0b..a2d9b5f88 100644
--- a/openstack/python-masakariclient/python-masakariclient.spec.j2
+++ b/openstack/python-masakariclient/python-masakariclient.spec.j2
@@ -79,7 +79,7 @@ rm -r doc/build/html/.{doctrees,buildinfo}
 install -p -D -m 644 doc/build/man/python-masakariclient.1 %{buildroot}%{_mandir}/man1/python-masakariclient.1
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-masakariclient
 %license LICENSE
diff --git a/openstack/python-mistralclient/python-mistralclient.spec.j2 b/openstack/python-mistralclient/python-mistralclient.spec.j2
index f0854c6a9..fcef9992f 100644
--- a/openstack/python-mistralclient/python-mistralclient.spec.j2
+++ b/openstack/python-mistralclient/python-mistralclient.spec.j2
@@ -76,7 +76,7 @@ rm -r doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-mistralclient
 %license LICENSE
diff --git a/openstack/python-monascaclient/python-monascaclient.spec.j2 b/openstack/python-monascaclient/python-monascaclient.spec.j2
index ca395b79d..5fab13dee 100644
--- a/openstack/python-monascaclient/python-monascaclient.spec.j2
+++ b/openstack/python-monascaclient/python-monascaclient.spec.j2
@@ -66,7 +66,7 @@ The Monasca Client was written using the OpenStack Heat Python client as a frame
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-monascaclient
 %doc README.rst
diff --git a/openstack/python-neutronclient/python-neutronclient.spec.j2 b/openstack/python-neutronclient/python-neutronclient.spec.j2
index 9576b3174..0488fbeb6 100644
--- a/openstack/python-neutronclient/python-neutronclient.spec.j2
+++ b/openstack/python-neutronclient/python-neutronclient.spec.j2
@@ -91,7 +91,7 @@ rm -r doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-neutronclient
 %license LICENSE
diff --git a/openstack/python-novaclient/python-novaclient.spec.j2 b/openstack/python-novaclient/python-novaclient.spec.j2
index f84981ffa..e75de22f6 100644
--- a/openstack/python-novaclient/python-novaclient.spec.j2
+++ b/openstack/python-novaclient/python-novaclient.spec.j2
@@ -85,7 +85,7 @@ rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo
 
 %check
 export OS_TEST_PATH=novaclient/tests/unit
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-novaclient
 %license LICENSE
diff --git a/openstack/python-octaviaclient/python-octaviaclient.spec.j2 b/openstack/python-octaviaclient/python-octaviaclient.spec.j2
index 36dc163a4..694f6ef61 100644
--- a/openstack/python-octaviaclient/python-octaviaclient.spec.j2
+++ b/openstack/python-octaviaclient/python-octaviaclient.spec.j2
@@ -72,7 +72,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %check
 # we don't want hacking
 rm -f octaviaclient/tests/unit/test_hacking.py
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-octaviaclient
 %doc README.rst
diff --git a/openstack/python-openstackclient/python-openstackclient.spec.j2 b/openstack/python-openstackclient/python-openstackclient.spec.j2
index f983f4c24..988b3985d 100644
--- a/openstack/python-openstackclient/python-openstackclient.spec.j2
+++ b/openstack/python-openstackclient/python-openstackclient.spec.j2
@@ -107,7 +107,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 install -p -D -m 644 doc/build/man/openstack.1 %{buildroot}%{_mandir}/man1/openstack.1
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-openstackclient
 %doc README.rst
diff --git a/openstack/python-saharaclient/python-saharaclient.spec.j2 b/openstack/python-saharaclient/python-saharaclient.spec.j2
index 19acf60b6..78bab596b 100644
--- a/openstack/python-saharaclient/python-saharaclient.spec.j2
+++ b/openstack/python-saharaclient/python-saharaclient.spec.j2
@@ -74,7 +74,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %check
 # we don't want to depend on hacking/flake8/pep8
 rm -v saharaclient/tests/unit/test_hacking.py
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-saharaclient
 %license LICENSE
diff --git a/openstack/python-senlinclient/python-senlinclient.spec.j2 b/openstack/python-senlinclient/python-senlinclient.spec.j2
index 8e44d2268..1959e2468 100644
--- a/openstack/python-senlinclient/python-senlinclient.spec.j2
+++ b/openstack/python-senlinclient/python-senlinclient.spec.j2
@@ -87,7 +87,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-senlinclient
 %license LICENSE
diff --git a/openstack/python-swiftclient/python-swiftclient.spec.j2 b/openstack/python-swiftclient/python-swiftclient.spec.j2
index 5c825bc3b..fe3efec17 100644
--- a/openstack/python-swiftclient/python-swiftclient.spec.j2
+++ b/openstack/python-swiftclient/python-swiftclient.spec.j2
@@ -60,7 +60,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/python-troveclient/python-troveclient.spec.j2 b/openstack/python-troveclient/python-troveclient.spec.j2
index 00f3223bd..b0454ddfc 100644
--- a/openstack/python-troveclient/python-troveclient.spec.j2
+++ b/openstack/python-troveclient/python-troveclient.spec.j2
@@ -82,7 +82,7 @@ rm -r doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-troveclient
 %doc README.rst
diff --git a/openstack/python-vitrageclient/python-vitrageclient.spec.j2 b/openstack/python-vitrageclient/python-vitrageclient.spec.j2
index d571ea09e..c776ec29e 100644
--- a/openstack/python-vitrageclient/python-vitrageclient.spec.j2
+++ b/openstack/python-vitrageclient/python-vitrageclient.spec.j2
@@ -73,7 +73,7 @@ install -p -D -m 644 tools/vitrage.bash_completion %{buildroot}%{_sysconfdir}/ba
 rm %{buildroot}%{_datadir}/vitrage.bash_completion
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-vitrageclient
 %doc README.rst
diff --git a/openstack/python-watcherclient/python-watcherclient.spec.j2 b/openstack/python-watcherclient/python-watcherclient.spec.j2
index 78066c65d..62bc7b46a 100644
--- a/openstack/python-watcherclient/python-watcherclient.spec.j2
+++ b/openstack/python-watcherclient/python-watcherclient.spec.j2
@@ -77,7 +77,7 @@ rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo
 
 %check
 export TEST_PATH=./watcherclient/tests/unit
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-watcherclient
 %doc README.rst
diff --git a/openstack/python-zaqarclient/python-zaqarclient.spec.j2 b/openstack/python-zaqarclient/python-zaqarclient.spec.j2
index 758fa6603..409cb189c 100644
--- a/openstack/python-zaqarclient/python-zaqarclient.spec.j2
+++ b/openstack/python-zaqarclient/python-zaqarclient.spec.j2
@@ -76,7 +76,7 @@ rm -r doc/build/html/.{doctrees,buildinfo}
 %py3_install
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-zaqarclient
 %doc README.rst ChangeLog examples
diff --git a/openstack/python-zunclient/python-zunclient.spec.j2 b/openstack/python-zunclient/python-zunclient.spec.j2
index f65fb427c..79722e797 100644
--- a/openstack/python-zunclient/python-zunclient.spec.j2
+++ b/openstack/python-zunclient/python-zunclient.spec.j2
@@ -82,7 +82,7 @@ export OS_TEST_PATH=./zunclient/tests/unit/
 rm -f zunclient/tests/unit/test_shell.py
 rm -f zunclient/tests/unit/test_functional_utils.py
 rm -rf zunclient/tests/functional
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-zunclient
 %doc README.rst
diff --git a/openstack/renderspec/renderspec.spec.j2 b/openstack/renderspec/renderspec.spec.j2
index 2be8565c4..b8109766c 100644
--- a/openstack/renderspec/renderspec.spec.j2
+++ b/openstack/renderspec/renderspec.spec.j2
@@ -64,7 +64,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/reno/reno.spec.j2 b/openstack/reno/reno.spec.j2
index c5aa68407..c8d327aea 100644
--- a/openstack/reno/reno.spec.j2
+++ b/openstack/reno/reno.spec.j2
@@ -63,7 +63,7 @@ sed -i '/^hacking.*/d' test-requirements.txt
 %check
 rm -rf .git
 git init .
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/stackviz/stackviz.spec.j2 b/openstack/stackviz/stackviz.spec.j2
index 41def60c6..3d5b250d2 100644
--- a/openstack/stackviz/stackviz.spec.j2
+++ b/openstack/stackviz/stackviz.spec.j2
@@ -81,7 +81,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %check
 export OS_TEST_PATH=./stackviz/tests
 export PYTHONPATH=.
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 %endif
 
 
diff --git a/openstack/sushy/sushy.spec.j2 b/openstack/sushy/sushy.spec.j2
index 1d0251c6a..153d11ea0 100644
--- a/openstack/sushy/sushy.spec.j2
+++ b/openstack/sushy/sushy.spec.j2
@@ -61,7 +61,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-sushy
 %license LICENSE
diff --git a/openstack/taskflow/taskflow.spec.j2 b/openstack/taskflow/taskflow.spec.j2
index f6b64df82..11cedf44a 100644
--- a/openstack/taskflow/taskflow.spec.j2
+++ b/openstack/taskflow/taskflow.spec.j2
@@ -95,7 +95,7 @@ PBR_VERSION={{ upstream_version }} %sphinx_build -b html doc/source doc/build/ht
 rm -rf doc/build/html/.{doctrees,buildinfo}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-taskflow
 %doc README.rst
diff --git a/openstack/validations-libs/validations-libs.spec.j2 b/openstack/validations-libs/validations-libs.spec.j2
index 9be70a2c4..70cf968a0 100644
--- a/openstack/validations-libs/validations-libs.spec.j2
+++ b/openstack/validations-libs/validations-libs.spec.j2
@@ -107,7 +107,7 @@ install -p -D -m 644 roles/fetch-validations/defaults/main.yaml \
                      %{buildroot}%{_datadir}/ansible/roles/fetch-validations/defaults/
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n {{ py2name(py_versions='py3') }}
 %license LICENSE
diff --git a/openstack/vmware-nsxlib/vmware-nsxlib.spec.j2 b/openstack/vmware-nsxlib/vmware-nsxlib.spec.j2
index 6aa7c74e3..e114131ac 100644
--- a/openstack/vmware-nsxlib/vmware-nsxlib.spec.j2
+++ b/openstack/vmware-nsxlib/vmware-nsxlib.spec.j2
@@ -85,7 +85,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %fdupes %{buildroot}%{python3_sitelib}
 
 %check
-python3 -m stestr.cli run
+%{openstack_stestr_run}
 
 %files -n python3-vmware-nsxlib
 %license LICENSE