diff --git a/python-setuptools_scm.changes b/python-setuptools_scm.changes
index 638fcdd..08f99af 100644
--- a/python-setuptools_scm.changes
+++ b/python-setuptools_scm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jul 18 09:21:17 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Pin pytest3 for now, pytest4 and 5 work fine in upstream git
+  and will be solved with next release
+
 -------------------------------------------------------------------
 Tue May 14 11:26:42 UTC 2019 - Marketa Calabkova <mcalabkova@suse.com>
 
diff --git a/python-setuptools_scm.spec b/python-setuptools_scm.spec
index 17ef7ff..3dc6814 100644
--- a/python-setuptools_scm.spec
+++ b/python-setuptools_scm.spec
@@ -19,16 +19,13 @@
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %global flavor @BUILD_FLAVOR@%{nil}
 %if "%{flavor}" == "test"
-%define test 1
+%define psuffix -test
 %bcond_without test
 %else
+%define psuffix %{nil}
 %bcond_with test
 %endif
-%if %{with test}
-Name:           python-setuptools_scm-%{flavor}
-%else
-Name:           python-setuptools_scm
-%endif
+Name:           python-setuptools_scm%{psuffix}
 Version:        3.3.3
 Release:        0
 Summary:        Python setuptools handler for SCM tags
@@ -45,7 +42,7 @@ BuildArch:      noarch
 %if %{with test}
 # Testing requirements
 BuildRequires:  %{python_module pip}
-BuildRequires:  %{python_module pytest}
+BuildRequires:  %{python_module pytest < 4.0}
 BuildRequires:  %{python_module setuptools_scm = %{version}}
 BuildRequires:  git-core
 %endif