diff --git a/azure-cli.spec b/azure-cli.spec
index b5c516e..0966d03 100644
--- a/azure-cli.spec
+++ b/azure-cli.spec
@@ -264,9 +264,9 @@ Obsoletes:      azure-cli-storage < 2.4.3
 Provides:       azure-cli-vm = 2.2.23
 Obsoletes:      azure-cli-vm < 2.2.23
 Conflicts:      azure-cli < 2.0.0
+%endif
 
 BuildArch:      noarch
-%endif
 
 %description
 Microsoft Azure CLI 2.0 Command Line Utilities
@@ -278,9 +278,10 @@ Microsoft Azure CLI 2.0 Command Line Utilities
 %if !%{with test}
 %build
 %pyproject_wheel
+%endif
 
 %install
-%if 0%{?_test}
+%if %{with test}
 # disable debug packages in package test to prevent error about missing files
 %define debug_package %{nil}
 %else
@@ -288,7 +289,6 @@ Microsoft Azure CLI 2.0 Command Line Utilities
 install -DTm644 %{buildroot}%{_bindir}/az.completion.sh %{buildroot}%{_datadir}/bash-completion/completions/az
 %fdupes %{buildroot}%{_sitelibdir}
 %endif
-%endif
 
 %if %{with test}
 %check