diff --git a/openstack/python-solumclient/python-solumclient.spec.j2 b/openstack/python-solumclient/python-solumclient.spec.j2
index ddae9f0e0..d07a3e75a 100644
--- a/openstack/python-solumclient/python-solumclient.spec.j2
+++ b/openstack/python-solumclient/python-solumclient.spec.j2
@@ -62,7 +62,6 @@ This package contains the documentation.
 %prep
 %autosetup -n %{name}-%{version}
 %py_req_cleanup
-sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
 
 %build
 %py2_build
diff --git a/openstack/python-troveclient/python-troveclient.spec.j2 b/openstack/python-troveclient/python-troveclient.spec.j2
index 05925aaf6..5cf433e1b 100644
--- a/openstack/python-troveclient/python-troveclient.spec.j2
+++ b/openstack/python-troveclient/python-troveclient.spec.j2
@@ -55,7 +55,6 @@ DBaaS API.
 %prep
 %autosetup -n %{name}-%{version}
 %py_req_cleanup
-sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
 
 %build
 %py2_build
diff --git a/openstack/python-watcherclient/python-watcherclient.spec.j2 b/openstack/python-watcherclient/python-watcherclient.spec.j2
index 663951795..1bec0c1a6 100644
--- a/openstack/python-watcherclient/python-watcherclient.spec.j2
+++ b/openstack/python-watcherclient/python-watcherclient.spec.j2
@@ -54,7 +54,6 @@ This package contains the documentation.
 %prep
 %autosetup -n %{name}-%{version}
 %py_req_cleanup
-sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
 
 %build
 %py2_build
diff --git a/openstack/python-zaqarclient/python-zaqarclient.spec.j2 b/openstack/python-zaqarclient/python-zaqarclient.spec.j2
index 546adbcd4..5cc0d7fdf 100644
--- a/openstack/python-zaqarclient/python-zaqarclient.spec.j2
+++ b/openstack/python-zaqarclient/python-zaqarclient.spec.j2
@@ -55,7 +55,6 @@ Zaqar Queueing API.
 %prep
 %autosetup -n %{name}-%{version}
 %py_req_cleanup
-sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
 
 %build
 %py2_build
diff --git a/openstack/stevedore/stevedore.spec.j2 b/openstack/stevedore/stevedore.spec.j2
index 6d8221f33..802fa3017 100644
--- a/openstack/stevedore/stevedore.spec.j2
+++ b/openstack/stevedore/stevedore.spec.j2
@@ -57,7 +57,6 @@ This package contains documentation in HTML format.
 %autosetup -p1 -n {{ pypi_name }}-%{version}
 %py_req_cleanup
 
-
 %build
 %python_build
 
diff --git a/openstack/tripleo-common/tripleo-common.spec.j2 b/openstack/tripleo-common/tripleo-common.spec.j2
index 6f7ddb200..c68648b9d 100644
--- a/openstack/tripleo-common/tripleo-common.spec.j2
+++ b/openstack/tripleo-common/tripleo-common.spec.j2
@@ -79,7 +79,7 @@ don't fit in a product.
 
 %prep
 %autosetup -n %{sname}-%{version}
-sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
+%py_req_cleanup
 
 %build
 %{py2_build}