diff --git a/openstack/freezer-tempest-plugin/freezer-tempest-plugin.spec.j2 b/openstack/freezer-tempest-plugin/freezer-tempest-plugin.spec.j2
index 97f5abb7f..e4eff44cd 100644
--- a/openstack/freezer-tempest-plugin/freezer-tempest-plugin.spec.j2
+++ b/openstack/freezer-tempest-plugin/freezer-tempest-plugin.spec.j2
@@ -4,11 +4,7 @@
 {% set upstream_version = upstream_version() %}
 
 %global sname freezer_tempest_plugin
-%global with_doc 0
-%global common_desc \
-This package contains Tempest tests to cover the freezer project. \
-Additionally it provides a plugin to automatically load these tests into Tempest.
-Name:          {{ py2pkg('freezer-tempest-plugin') }}
+Name:          {{ py2name(py_versions='py3') }}
 Version:       {{ py2rpmversion() }}
 Release:       {{ py2rpmrelease() }}
 Summary:       Tempest plugin for the freezer project
@@ -17,60 +13,36 @@ Group:         Development/Languages/Python
 URL:           https://git.openstack.org/cgit/openstack/{{ pypi_name }}
 Source0:       {{ source|basename }}
 BuildRequires: openstack-macros
-BuildRequires: {{ py2pkg('pbr') }}
-BuildRequires: {{ py2pkg('setuptools') }}
-Requires:      {{ py2pkg('Tempest') }}
-Requires:      {{ py2pkg('oslo.config') }}
-Requires:      {{ py2pkg('oslo.utils') }}
-Requires:      {{ py2pkg('paramiko') }}
-Requires:      {{ py2pkg('pbr') }}
-Requires:      {{ py2pkg('six') }}
+BuildRequires: {{ py3('pbr') }}
+BuildRequires: {{ py3('setuptools') }}
+Requires:      {{ py2pkg('tempest') }}
+Requires:      {{ py3('oslo.config') }}
+Requires:      {{ py3('oslo.utils') }}
+Requires:      {{ py3('paramiko') }}
+Requires:      {{ py3('pbr') }}
+Requires:      {{ py3('six') }}
 BuildArch:     noarch
 
 %description
-%{common_desc}
-
-%if 0%{?with_doc}
-%package doc
-Summary:    Documentation for freezer tempest plugin
-BuildRequires: {{ py2pkg('Sphinx') }}
-BuildRequires: {{ py2pkg('oslosphinx') }}
-
-%description doc
-It contains the documentation for the freezer tempest tests.
-%endif
+This package contains Tempest tests to cover the freezer project.
+Additionally it provides a plugin to automatically load these tests into Tempest.
 
 %prep
-%autosetup -n %{sname}-{{ upstream_version }}
+%autosetup -p1 -n %{sname}-{{ upstream_version }}
 
 # Let's handle dependencies ourseleves
 %py_req_cleanup
-# Remove bundled egg-info
-rm -rf %{module}.egg-info
 
 %build
-%{py2_build}
-
-# Generate Docs
-%if 0%{?with_doc}
-%{__python2} setup.py build_sphinx
-# remove the sphinx build leftovers
-rm -rf doc/build/html/.{doctrees,buildinfo}
-%endif
+%{py3_build}
 
 %install
-%{py2_install}
+%{py3_install}
 
 %files
 %license LICENSE
 %doc README.rst
-%{python2_sitelib}/freezer_tempest_plugin
-%{python2_sitelib}/*.egg-info
-
-%if 0%{?with_doc}
-%files doc
-%doc doc/build/html
-%license LICENSE
-%endif
+%{python3_sitelib}/freezer_tempest_plugin
+%{python3_sitelib}/*.egg-info
 
 %changelog