diff --git a/openstack/aodhclient/aodhclient.spec.j2 b/openstack/aodhclient/aodhclient.spec.j2
index 3e7e097c1..f18ed4a67 100644
--- a/openstack/aodhclient/aodhclient.spec.j2
+++ b/openstack/aodhclient/aodhclient.spec.j2
@@ -68,7 +68,7 @@ rm -r doc/build/html/.{doctrees,buildinfo}
 
 %check
 # FIXME: only run unittests for now.
-python3 -m stestr.cli --test-path  ./aodhclient/tests/unit run
+%{openstack_stestr_run} --test-path  ./aodhclient/tests/unit
 
 %files
 %doc README.rst
diff --git a/openstack/freezer/freezer.spec.j2 b/openstack/freezer/freezer.spec.j2
index 687cc8f1d..14777c624 100644
--- a/openstack/freezer/freezer.spec.j2
+++ b/openstack/freezer/freezer.spec.j2
@@ -184,12 +184,7 @@ rm -fr %{buildroot}%{_prefix}/freezer/scripts/vss.ps1
 
 %check
 export OS_TEST_PATH=./freezer/tests/unit
-%if 0%{?suse_version}
-PYTHON=python3 stestr run
-%endif
-%if 0%{?rdo}
-stestr-3 run
-%endif
+%{openstack_stestr_run}
 
 %files
 %license LICENSE
diff --git a/openstack/heat/heat.spec.j2 b/openstack/heat/heat.spec.j2
index dfd11a447..2e2bebc9e 100644
--- a/openstack/heat/heat.spec.j2
+++ b/openstack/heat/heat.spec.j2
@@ -208,7 +208,7 @@ This package contains the Heat docker plugin
 
 ### heat_docker plugin
 pushd contrib/heat_docker
-OSLO_PACKAGE_VERSION=%{version} python3 setup.py build
+OSLO_PACKAGE_VERSION=%{version} %{py3_build}
 popd
 
 ### documentation
@@ -224,7 +224,7 @@ rm -rf doc/build/man/.{doctrees,buildinfo}
 
 ### heat_docker plugin
 pushd contrib/heat_docker
-OSLO_PACKAGE_VERSION=%{version} python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
+OSLO_PACKAGE_VERSION=%{version} %{py3_install]}
 # no need for the egg-info file
 rm -r %{buildroot}%{python3_sitelib}/heat_contrib_docker-*.egg-info
 popd
diff --git a/openstack/ironic-python-agent/ironic-python-agent.spec.j2 b/openstack/ironic-python-agent/ironic-python-agent.spec.j2
index ac87e304f..817ad3752 100644
--- a/openstack/ironic-python-agent/ironic-python-agent.spec.j2
+++ b/openstack/ironic-python-agent/ironic-python-agent.spec.j2
@@ -34,6 +34,7 @@ BuildRequires:  {{ py3('rtslib-fb') }}
 BuildRequires:  {{ py3('stestr') }}
 BuildRequires:  {{ py3('stevedore') }}
 BuildRequires:  {{ py3('tenacity') }}
+BuildRequires:  {{ py3('tooz') }}
 Requires:       python3-{{ pypi_name }} = %{version}-%{release}
 BuildArch:      noarch
 %if 0%{?suse_version}
@@ -73,6 +74,7 @@ Requires:       {{ py3('requests') }}
 Requires:       {{ py3('rtslib-fb') }}
 Requires:       {{ py3('stevedore') }}
 Requires:       {{ py3('tenacity') }}
+Requires:       {{ py3('tooz') }}
 
 %description -n python3-{{ pypi_name }}
 The ironic-python-agent works with the agent driver in Ironic to provision the node.
diff --git a/openstack/python-ironic-inspector-client/python-ironic-inspector-client.spec.j2 b/openstack/python-ironic-inspector-client/python-ironic-inspector-client.spec.j2
index 700df34e9..3bd4ccd80 100644
--- a/openstack/python-ironic-inspector-client/python-ironic-inspector-client.spec.j2
+++ b/openstack/python-ironic-inspector-client/python-ironic-inspector-client.spec.j2
@@ -13,6 +13,7 @@ URL:            https://docs.openstack.org/{{ pypi_name }}
 Source0:        {{ source }}
 BuildRequires:  openstack-macros
 BuildRequires:  {{ py3('fixtures') }}
+BuildRequires:  {{ py3('keystoneauth1') }}
 BuildRequires:  {{ py3('python-openstackclient') }}
 BuildRequires:  {{ py3('openstackdocstheme') }}
 BuildRequires:  {{ py3('osc-lib') }}
@@ -31,7 +32,7 @@ scheduling from a bare metal node, given its power management credentials
 
 This package contains Python client and command line tool for Ironic Inspector.
 
-%package -n python3-ironic-inspector-client
+%package -n {{ py2name(py_versions='py3') }}
 Summary: Python client and CLI tool for Ironic Inspector
 Requires:       {{ py3('PyYAML') }}
 Requires:       {{ py3('keystoneauth1') }}
@@ -41,7 +42,7 @@ Requires:       {{ py3('oslo.i18n') }}
 Requires:       {{ py3('oslo.utils') }}
 Requires:       {{ py3('requests') }}
 
-%description -n python3-ironic-inspector-client
+%description -n {{ py2name(py_versions='py3') }}
 Ironic Inspector is an auxiliary service for discovering hardware properties
 for a node managed by OpenStack Ironic. Hardware introspection or hardware
 properties discovery is a process of getting hardware parameters required for
@@ -67,10 +68,10 @@ sed -i -e 's,doc8.*,,' test-requirements.txt
 
 %check
 %{python_expand rm -rf .testrepository
-python3 -m unittest discover ironic_inspector_client
+$python -m unittest discover ironic_inspector_client
 }
 
-%files -n python3-ironic-inspector-client
+%files -n {{ py2name(py_versions='py3') }}
 %doc README.rst
 %license LICENSE
 %{python3_sitelib}/ironic_inspector_client
diff --git a/openstack/tempest/tempest.spec.j2 b/openstack/tempest/tempest.spec.j2
index c191bdee5..4356777a5 100644
--- a/openstack/tempest/tempest.spec.j2
+++ b/openstack/tempest/tempest.spec.j2
@@ -18,6 +18,7 @@ BuildRequires:  {{ py3('PrettyTable') }}
 BuildRequires:  {{ py3('PyYAML') }}
 BuildRequires:  {{ py3('cliff') }}
 BuildRequires:  {{ py3('debtcollector') }}
+BuildRequires:  {{ py3('defusedxml') }}
 BuildRequires:  {{ py3('fixtures') }}
 BuildRequires:  {{ py3('jsonschema') }}
 BuildRequires:  {{ py3('netaddr') }}
@@ -54,6 +55,7 @@ Requires:       {{ py3('PrettyTable') }}
 Requires:       {{ py3('PyYAML') }}
 Requires:       {{ py3('cliff') }}
 Requires:       {{ py3('debtcollector') }}
+Requires:       {{ py3('defusedxml') }}
 Requires:       {{ py3('fixtures') }}
 Requires:       {{ py3('jsonschema') }}
 Requires:       {{ py3('netaddr') }}