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/mocket-3.8.6.tar.gz b/mocket-3.8.6.tar.gz
deleted file mode 100644
index 5f04865..0000000
--- a/mocket-3.8.6.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aeaa0ce03473f4770eba0de47392b3d7310356ae3a486b2a3ba14c437f8b9e92
-size 72587
diff --git a/mocket-3.8.7.tar.gz b/mocket-3.8.7.tar.gz
new file mode 100644
index 0000000..ae6485b
--- /dev/null
+++ b/mocket-3.8.7.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3a0f1c01138df8f31e30ce41a54d2726319d9880066936c3019738ba80b842fe
+size 73263
diff --git a/python-mocket.changes b/python-mocket.changes
index ef63558..337a677 100644
--- a/python-mocket.changes
+++ b/python-mocket.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Aug 11 07:17:16 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
+
+- Update to version 3.8.7
+  * This version ships the change to support the libmagic wrapper
+    distributed with file's command.
+
+------------------------------------------------------------------- 
+Tue Aug 11 07:08:04 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Switch to multibuild as we create cycle with python-pook otherwise
+
 -------------------------------------------------------------------
 Sat Aug  8 13:00:29 UTC 2020 - Sebastian Wagner <sebix+novell.com@sebix.at>
 
diff --git a/python-mocket.spec b/python-mocket.spec
index a54243e..412e8b4 100644
--- a/python-mocket.spec
+++ b/python-mocket.spec
@@ -17,12 +17,19 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-Name:           python-mocket
-Version:        3.8.6
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
+%define psuffix -test
+%bcond_without test
+%else
+%define psuffix %{nil}
+%bcond_with test
+%endif
+Name:           python-mocket%{psuffix}
+Version:        3.8.7
 Release:        0
 Summary:        Python socket mock framework
 License:        BSD-3-Clause
-Group:          Development/Languages/Python
 URL:            https://github.com/mindflayer/python-mocket
 Source0:        https://files.pythonhosted.org/packages/source/m/mocket/mocket-%{version}.tar.gz
 BuildRequires:  %{python_module setuptools}
@@ -38,7 +45,7 @@ Suggests:       python-redis
 Suggests:       python-requests
 Suggests:       python-xxhash
 BuildArch:      noarch
-# SECTION test requirements
+%if %{with test}
 BuildRequires:  %{python_module PySocks}
 BuildRequires:  %{python_module cryptography}
 BuildRequires:  %{python_module decorator}
@@ -57,7 +64,7 @@ BuildRequires:  %{python_module xxhash}
 BuildRequires:  ca-certificates-mozilla
 BuildRequires:  python3-aiohttp
 BuildRequires:  python3-async_timeout
-# /SECTION
+%endif
 %python_subpackages
 
 %description
@@ -66,35 +73,37 @@ included, with gevent/asyncio/SSL support.
 
 %prep
 %setup -q -n mocket-%{version}
-rm -f setup.cfg pytest.ini tox.ini
-sed -i '/pipenv/d' setup.py
+sed -i '/cov/ d' setup.cfg
+sed -i '/pipenv/ d' setup.py
 sed -i 's/==/>=/' requirements.txt
-touch conftest.py
 
 %build
+%if !%{with test}
 export LANG=en_US.UTF-8
 %python_build
+%endif
 
 %install
+%if !%{with test}
 export LANG=en_US.UTF-8
 %python_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
+%endif
 
 %check
+%if %{with test}
 export LANG=en_US.UTF-8
-export PYTHONPATH=${PWD}
 export SKIP_TRUE_HTTP=1
-%{python_expand  #
-if [ $python = python2 ]; then
-  $python -m pytest tests/main mocket -vv -k 'not RedisTestCase'
-else
-  $python -m pytest tests/main mocket tests/tests35/ -vv -k 'not RedisTestCase'
-fi
-}
+%define pytest_ignore_python2 --ignore tests/tests35 --ignore tests/tests38
+%pytest -k 'not RedisTestCase' %{?pytest_ignore%{$python_version}}
+%endif
 
+%if !%{with test}
 %files %{python_files}
 %doc README.rst
 %license LICENSE
-%{python_sitelib}/*
+%{python_sitelib}/mocket
+%{python_sitelib}/mocket-%{version}-py*.egg-info
+%endif
 
 %changelog