diff --git a/python-pbr.spec b/python-pbr.spec
index a612bed..1c28386 100644
--- a/python-pbr.spec
+++ b/python-pbr.spec
@@ -19,10 +19,13 @@
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %global flavor @BUILD_FLAVOR@%{nil}
 %if "%{flavor}" == "test"
+%define psuffix -test
 %bcond_without test
 %else
+%define psuffix %{nil}
 %bcond_with test
 %endif
+Name:           python-pbr%{psuffix}
 Version:        4.3.0
 Release:        0
 Summary:        Python Build Reasonableness
@@ -42,11 +45,6 @@ Requires(post): update-alternatives
 Requires(postun): update-alternatives
 Obsoletes:      python-pbr-doc
 BuildArch:      noarch
-%if !%{with test}
-Name:           python-pbr
-%else
-Name:           python-pbr-%{flavor}
-%endif
 %if %{with test}
 BuildRequires:  %{python_module Sphinx >= 1.6.2}
 BuildRequires:  %{python_module devel}