diff --git a/mock30.patch b/mock30.patch
new file mode 100644
index 0000000..3219e28
--- /dev/null
+++ b/mock30.patch
@@ -0,0 +1,46 @@
+From b2683fdfc2fbd67dfc14bfc8e9d2c06530975397 Mon Sep 17 00:00:00 2001
+From: Bruno Oliveira <bruno@esss.com.br>
+Date: Fri, 3 May 2019 08:58:31 -0300
+Subject: [PATCH] Fix tests due to new formatting in mock 3.0 and python 3.8
+
+---
+ test_pytest_mock.py | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/test_pytest_mock.py b/test_pytest_mock.py
+index 7bc38cb..562ff0c 100644
+--- a/test_pytest_mock.py
++++ b/test_pytest_mock.py
+@@ -10,11 +10,11 @@
+ 
+ # could not make some of the tests work on PyPy, patches are welcome!
+ skip_pypy = pytest.mark.skipif(
+-    platform.python_implementation() == "PyPy", reason="could not make work on pypy"
++    platform.python_implementation() == "PyPy", reason="could not make it work on pypy"
+ )
+ 
+-# Python 3.8 changed the output formatting (bpo-35500).
+-PY38 = sys.version_info >= (3, 8)
++# Python 3.8 changed the output formatting (bpo-35500), which has been ported to mock 3.0
++NEW_FORMATTING = sys.version_info >= (3, 8) or sys.version_info[0] == 2
+ 
+ 
+ @pytest.fixture
+@@ -209,7 +209,7 @@ def test_repr_with_name(self, mocker):
+ 
+     def __test_failure_message(self, mocker, **kwargs):
+         expected_name = kwargs.get("name") or "mock"
+-        if PY38:
++        if NEW_FORMATTING:
+             msg = "expected call not found.\nExpected: {0}()\nActual: not called."
+         else:
+             msg = "Expected call: {0}()\nNot called"
+@@ -620,7 +620,7 @@ def test(mocker):
+     """
+     )
+     result = testdir.runpytest("-s")
+-    if PY38:
++    if NEW_FORMATTING:
+         expected_lines = [
+             "*AssertionError: expected call not found.",
+             "*Expected: mock('', bar=4)",
diff --git a/python-pytest-mock.changes b/python-pytest-mock.changes
index b00d606..a916f02 100644
--- a/python-pytest-mock.changes
+++ b/python-pytest-mock.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 15 17:39:00 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Add patch from upstream to build with new mock:
+  * mock30.patch
+
 -------------------------------------------------------------------
 Mon Apr 29 08:07:10 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/python-pytest-mock.spec b/python-pytest-mock.spec
index baea0c2..090b1fc 100644
--- a/python-pytest-mock.spec
+++ b/python-pytest-mock.spec
@@ -27,6 +27,7 @@ License:        MIT
 Group:          Development/Languages/Python
 URL:            https://github.com/pytest-dev/pytest-mock
 Source:         https://files.pythonhosted.org/packages/source/p/pytest-mock/pytest-mock-%{version}.tar.gz
+Patch0:         mock30.patch
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools >= 36}
 BuildRequires:  %{python_module setuptools_scm}
@@ -50,6 +51,7 @@ of a test
 
 %prep
 %setup -q -n pytest-mock-%{version}
+%patch0 -p1
 
 %build
 %python_build