diff --git a/0.2.10.tar.gz b/0.2.10.tar.gz
new file mode 100644
index 0000000..5c75bcd
--- /dev/null
+++ b/0.2.10.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:72a59e5c350292fb003b1679f11c543d803d2187cba75ac8993a01d0f37003c1
+size 13909
diff --git a/0.2.8.tar.gz b/0.2.8.tar.gz
deleted file mode 100644
index 463e2a3..0000000
--- a/0.2.8.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c5db8adac49dac0fa24f5aa23be44f063cceb5bad9a91ddd6c27f0e3563145b8
-size 13695
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-EasyProcess.changes b/python-EasyProcess.changes
index fc8346e..e6bdb43 100644
--- a/python-EasyProcess.changes
+++ b/python-EasyProcess.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Mar 26 16:00:25 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Switch to multibuild in order to avoid cycle
+
+-------------------------------------------------------------------
+Thu Mar 26 09:06:42 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
+
+- update to version 0.2.10
+  * test and code fixtures
+
 -------------------------------------------------------------------
 Mon Jan 13 15:13:26 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
 
diff --git a/python-EasyProcess.spec b/python-EasyProcess.spec
index 66ab211..c05b4f6 100644
--- a/python-EasyProcess.spec
+++ b/python-EasyProcess.spec
@@ -17,21 +17,31 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-Name:           python-EasyProcess
-Version:        0.2.8
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
+%define psuffix -test
+%bcond_without test
+%else
+%define psuffix %{nil}
+%bcond_with test
+%endif
+Name:           python-EasyProcess%{psuffix}
+Version:        0.2.10
 Release:        0
 Summary:        Python subprocess interface
 License:        BSD-2-Clause
 URL:            https://github.com/ponty/easyprocess
 Source:         https://github.com/ponty/EasyProcess/archive/%{version}.tar.gz
-BuildRequires:  %{python_module nose}
 BuildRequires:  %{python_module setuptools}
-BuildRequires:  %{python_module six}
 BuildRequires:  fdupes
 BuildRequires:  iputils
 BuildRequires:  python-rpm-macros
-BuildRequires:  python3-2to3
 BuildArch:      noarch
+%if %{with test}
+BuildRequires:  %{python_module PyVirtualDisplay}
+BuildRequires:  %{python_module nose}
+BuildRequires:  %{python_module six}
+%endif
 %python_subpackages
 
 %description
@@ -58,29 +68,27 @@ Limitations:
 
 %prep
 %setup -q -n EasyProcess-%{version}
-# https://github.com/ponty/EasyProcess/issues/18
-sed -i "s/from easyprocess import EasyProcess/from easyprocess import EasyProcess;import sys/" easyprocess/examples/*.py
-sed -i "s/'python /sys.executable + ' /" easyprocess/examples/*.py
-sed -i "s/'python'/sys.executable/" easyprocess/examples/*.py
-
-# requires pyvirtualdisplay which is mostly dead package
-rm -f tests/coverage/fast/test_deadlock.py
-2to3 -w easyprocess/examples/log.py
 
 %build
 %python_build
 
 %install
+%if !%{with test}
 %python_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
+%endif
 
 %check
+%if %{with test}
 export LANG=en_US.UTF-8
-%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} nosetests-%{$python_bin_suffix} -v tests/coverage/
+%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} nosetests-%{$python_bin_suffix} -v tests/
+%endif
 
+%if !%{with test}
 %files %{python_files}
 %license LICENSE.txt
 %doc README.rst
 %{python_sitelib}/*
+%endif
 
 %changelog