diff --git a/openstack/XStatic-bootswatch/XStatic-bootswatch.spec.j2 b/openstack/XStatic-bootswatch/XStatic-bootswatch.spec.j2
index 4bbbe6113..fcf3c3a7f 100644
--- a/openstack/XStatic-bootswatch/XStatic-bootswatch.spec.j2
+++ b/openstack/XStatic-bootswatch/XStatic-bootswatch.spec.j2
@@ -8,7 +8,6 @@ Group:          Development/Languages/Python
 URL:            https://git.openstack.org/cgit/openstack/{sname}/
 Source0:        https://files.pythonhosted.org/packages/source/X/%{sname}/%{sname}-%{version}.tar.gz
 BuildRequires:  openstack-macros
-BuildRequires:  {{ py2pkg('devel') }}
 BuildRequires:  {{ py2pkg('setuptools') }}
 Requires:       {{ py2pkg('XStatic') }}
 BuildArch:      noarch
diff --git a/openstack/XStatic-mdi/XStatic-mdi.spec.j2 b/openstack/XStatic-mdi/XStatic-mdi.spec.j2
index b742f3cda..7059280d9 100644
--- a/openstack/XStatic-mdi/XStatic-mdi.spec.j2
+++ b/openstack/XStatic-mdi/XStatic-mdi.spec.j2
@@ -8,7 +8,6 @@ Group:          Development/Languages/Python
 URL:            https://git.openstack.org/cgit/openstack/xstatic-mdi/
 Source0:        https://files.pythonhosted.org/packages/source/X/%{sname}/%{sname}-%{version}.tar.gz
 BuildRequires:  openstack-macros
-BuildRequires:  {{ py2pkg('devel') }}
 BuildRequires:  {{ py2pkg('setuptools') }}
 Requires:       {{ py2pkg('XStatic') }}
 BuildArch:      noarch
diff --git a/openstack/XStatic-roboto-fontface/XStatic-roboto-fontface.spec.j2 b/openstack/XStatic-roboto-fontface/XStatic-roboto-fontface.spec.j2
index 554687b59..a6725ebd2 100644
--- a/openstack/XStatic-roboto-fontface/XStatic-roboto-fontface.spec.j2
+++ b/openstack/XStatic-roboto-fontface/XStatic-roboto-fontface.spec.j2
@@ -8,7 +8,6 @@ Group:          Development/Languages/Python
 URL:            https://git.openstack.org/cgit/openstack/xstatic-roboto-fontface/
 Source0:        https://files.pythonhosted.org/packages/source/X/%{sname}/%{sname}-%{version}.tar.gz
 BuildRequires:  openstack-macros
-BuildRequires:  {{ py2pkg('devel') }}
 BuildRequires:  {{ py2pkg('setuptools') }}
 BuildArch:      noarch
 
diff --git a/openstack/XStatic-smart-table/XStatic-smart-table.spec.j2 b/openstack/XStatic-smart-table/XStatic-smart-table.spec.j2
index 0832e4dfe..73a59b37f 100644
--- a/openstack/XStatic-smart-table/XStatic-smart-table.spec.j2
+++ b/openstack/XStatic-smart-table/XStatic-smart-table.spec.j2
@@ -9,7 +9,6 @@ Group:          Development/Languages/Python
 URL:            https://git.openstack.org/cgit/openstack/%{openstack_name}/
 Source0:        https://files.pythonhosted.org/packages/source/X/%{sname}/%{sname}-%{version}.tar.gz
 BuildRequires:  openstack-macros
-BuildRequires:  {{ py2pkg('devel') }}
 BuildRequires:  {{ py2pkg('setuptools') }}
 Requires:       {{ py2pkg('XStatic') }}
 BuildArch:      noarch
diff --git a/openstack/aodhclient/aodhclient.spec.j2 b/openstack/aodhclient/aodhclient.spec.j2
index 6f1ef9002..f6d80934d 100644
--- a/openstack/aodhclient/aodhclient.spec.j2
+++ b/openstack/aodhclient/aodhclient.spec.j2
@@ -9,7 +9,6 @@ URL:            https://github.com/openstack/python-aodhclient
 Source0:        https://files.pythonhosted.org/packages/source/a/%{sname}/%{sname}-%{version}.tar.gz
 BuildRequires:  openstack-macros
 BuildRequires:  {{ py2pkg('cliff') }}
-BuildRequires:  {{ py2pkg('devel') }}
 BuildRequires:  {{ py2pkg('keystoneauth1') }}
 BuildRequires:  {{ py2pkg('openstackdocstheme') }}
 BuildRequires:  {{ py2pkg('oslo.serialization') }}
diff --git a/openstack/barbican-tempest-plugin/barbican-tempest-plugin.spec.j2 b/openstack/barbican-tempest-plugin/barbican-tempest-plugin.spec.j2
index ffe54789a..c486da131 100644
--- a/openstack/barbican-tempest-plugin/barbican-tempest-plugin.spec.j2
+++ b/openstack/barbican-tempest-plugin/barbican-tempest-plugin.spec.j2
@@ -17,7 +17,6 @@ Group:         Development/Languages/Python
 URL:           https://git.openstack.org/cgit/openstack/{{ pypi_name }}
 Source0:       {{ source|basename }}
 BuildRequires: openstack-macros
-BuildRequires: {{ py2pkg('devel') }}
 BuildRequires: {{ py2pkg('pbr') }}
 BuildRequires: {{ py2pkg('setuptools') }}
 Requires:      {{ py2pkg('Tempest') }}
diff --git a/openstack/ceilometermiddleware/ceilometermiddleware.spec.j2 b/openstack/ceilometermiddleware/ceilometermiddleware.spec.j2
index 4aa33cc8a..af4e1601c 100644
--- a/openstack/ceilometermiddleware/ceilometermiddleware.spec.j2
+++ b/openstack/ceilometermiddleware/ceilometermiddleware.spec.j2
@@ -13,7 +13,6 @@ URL:            https://docs.openstack.org/developer/ceilometermiddleware
 Source0:        {{ source }}
 BuildRequires:  openstack-macros
 BuildRequires:  {{ py2pkg('betamax') }}
-BuildRequires:  {{ py2pkg('devel') }}
 BuildRequires:  {{ py2pkg('keystoneauth1') }}
 BuildRequires:  {{ py2pkg('python-keystoneclient') }}
 BuildRequires:  {{ py2pkg('mock') }}
diff --git a/openstack/cinder-tempest-plugin/cinder-tempest-plugin.spec.j2 b/openstack/cinder-tempest-plugin/cinder-tempest-plugin.spec.j2
index fa528be03..c4af49859 100644
--- a/openstack/cinder-tempest-plugin/cinder-tempest-plugin.spec.j2
+++ b/openstack/cinder-tempest-plugin/cinder-tempest-plugin.spec.j2
@@ -17,7 +17,6 @@ Group:         Development/Languages/Python
 URL:           https://git.openstack.org/cgit/openstack/{{ pypi_name }}
 Source0:       {{ source|basename }}
 BuildRequires: openstack-macros
-BuildRequires: {{ py2pkg('devel') }}
 BuildRequires: {{ py2pkg('pbr') }}
 BuildRequires: {{ py2pkg('setuptools') }}
 Requires:      {{ py2pkg('Tempest') }}
diff --git a/openstack/cliff/cliff.spec.j2 b/openstack/cliff/cliff.spec.j2
index 28ff7c96c..5d0f914de 100644
--- a/openstack/cliff/cliff.spec.j2
+++ b/openstack/cliff/cliff.spec.j2
@@ -12,7 +12,6 @@ Group:          Development/Languages/Python
 URL:            https://launchpad.net/python-{{ pypi_name }}
 Source0:        {{ source }}
 BuildRequires:  openstack-macros
-BuildRequires:  {{ py2pkg('devel', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('PrettyTable', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('PyYAML', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('cmd2', py_versions=['py2']) }}
diff --git a/openstack/debtcollector/debtcollector.spec.j2 b/openstack/debtcollector/debtcollector.spec.j2
index f1843ad2e..743191428 100644
--- a/openstack/debtcollector/debtcollector.spec.j2
+++ b/openstack/debtcollector/debtcollector.spec.j2
@@ -8,7 +8,6 @@ Group:          Development/Languages/Python
 URL:            https://docs.openstack.org/developer/debtcollector/
 Source0:        https://files.pythonhosted.org/packages/source/d/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 BuildRequires:  openstack-macros
-BuildRequires:  {{ py2pkg('devel', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('fixtures', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('funcsigs', py_versions=['py2']) }}
 BuildRequires:  {{ py2pkg('pbr', py_versions=['py2', 'py3']) }}
diff --git a/openstack/designate-tempest-plugin/designate-tempest-plugin.spec.j2 b/openstack/designate-tempest-plugin/designate-tempest-plugin.spec.j2
index 0b4bad966..c9fff38bf 100644
--- a/openstack/designate-tempest-plugin/designate-tempest-plugin.spec.j2
+++ b/openstack/designate-tempest-plugin/designate-tempest-plugin.spec.j2
@@ -17,7 +17,6 @@ Group:         Development/Languages/Python
 URL:           https://git.openstack.org/cgit/openstack/{{ pypi_name }}
 Source0:       {{ source|basename }}
 BuildRequires: openstack-macros
-BuildRequires: {{ py2pkg('devel') }}
 BuildRequires: {{ py2pkg('pbr') }}
 BuildRequires: {{ py2pkg('setuptools') }}
 Requires:      {{ py2pkg('Tempest') }}
diff --git a/openstack/dib-utils/dib-utils.spec.j2 b/openstack/dib-utils/dib-utils.spec.j2
index 6ef07056b..e33493e18 100644
--- a/openstack/dib-utils/dib-utils.spec.j2
+++ b/openstack/dib-utils/dib-utils.spec.j2
@@ -9,7 +9,6 @@ URL:            https://launchpad.net/%{sname}
 Source0:        https://tarballs.openstack.org//%{sname}/%{sname}-%{version}.tar.gz
 BuildRequires:  openstack-macros
 BuildRequires:  {{ py2pkg('d2to1') }}
-BuildRequires:  {{ py2pkg('devel') }}
 BuildRequires:  {{ py2pkg('pbr') }}
 BuildArch:      noarch