diff --git a/_multibuild b/_multibuild
new file mode 100644
index 0000000..fcc7b97
--- /dev/null
+++ b/_multibuild
@@ -0,0 +1,3 @@
+<multibuild>
+  <package>test</package>
+</multibuild>
diff --git a/python-incremental.changes b/python-incremental.changes
index 78378a0..102483c 100644
--- a/python-incremental.changes
+++ b/python-incremental.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun  6 15:38:34 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Switch to multibuild to avoid build cycle
+
 -------------------------------------------------------------------
 Wed Jun  5 06:14:13 UTC 2019 - pgajdos@suse.com
 
diff --git a/python-incremental.spec b/python-incremental.spec
index 0144861..e12d01f 100644
--- a/python-incremental.spec
+++ b/python-incremental.spec
@@ -17,7 +17,15 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-Name:           python-incremental
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
+%define psuffix -test
+%bcond_without test
+%else
+%define psuffix %{nil}
+%bcond_with test
+%endif
+Name:           python-incremental%{psuffix}
 Version:        17.5.0
 Release:        0
 Summary:        Library that versions your Python projects
@@ -31,11 +39,11 @@ BuildRequires:  python-rpm-macros
 Suggests:       %{python_module Twisted >= 16.4.0}
 Suggests:       %{python_module click >= 6.0}
 BuildArch:      noarch
-# SECTION test requirements
+%if %{with test}
 BuildRequires:  %{python_module Twisted >= 16.4.0}
 BuildRequires:  %{python_module click >= 6.0}
 BuildRequires:  %{python_module pytest}
-# /SECTION
+%endif
 %python_subpackages
 
 %description
@@ -48,15 +56,21 @@ Incremental is a small library that versions your Python projects.
 %python_build
 
 %install
+%if !%{with test}
 %python_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
+%endif
 
+%if %{with test}
 %check
 %pytest
+%endif
 
+%if !%{with test}
 %files %{python_files}
 %license LICENSE
 %doc NEWS.rst README.rst
 %{python_sitelib}/*
+%endif
 
 %changelog