diff --git a/fix_tests.patch b/fix_tests.patch
new file mode 100644
index 0000000..e329955
--- /dev/null
+++ b/fix_tests.patch
@@ -0,0 +1,46 @@
+From 970e4b1f8cfd6bd750b4c8240efad378cbf049c2 Mon Sep 17 00:00:00 2001
+From: Bruno Oliveira <nicoddemus@gmail.com>
+Date: Mon, 1 Jul 2019 19:31:36 -0300
+Subject: [PATCH] Fix tests expectations with latest pytest
+
+Fix #149
+---
+ test_pytest_mock.py | 2 +-
+ tox.ini             | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/test_pytest_mock.py b/test_pytest_mock.py
+index 562ff0c..cdc04fe 100644
+--- a/test_pytest_mock.py
++++ b/test_pytest_mock.py
+@@ -639,7 +639,7 @@ def test(mocker):
+         "*Use -v to get the full diff*",
+         "*Kwargs:*",
+         "*assert {} == {'bar': 4}*",
+-        "*Right contains more items:*",
++        "*Right contains* more item*",
+         "*{'bar': 4}*",
+         "*Use -v to get the full diff*",
+     ]
+diff --git a/tox.ini b/tox.ini
+index 427b25f..98117bf 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -10,7 +10,7 @@ commands =
+ 
+ [testenv:norewrite]
+ commands =
+-    pytest test_pytest_mock.py --assert=plain -ra
++    pytest test_pytest_mock.py --assert=plain
+ 
+ [testenv:linting]
+ skipsdist = True
+@@ -20,7 +20,7 @@ basepython = python3.6
+ commands = pre-commit run --all-files --show-diff-on-failure
+ 
+ [pytest]
+-addopts = -ra
++addopts = -r a
+ 
+ [flake8]
+ max-line-length = 88
diff --git a/python-pytest-mock.changes b/python-pytest-mock.changes
index b00d606..dbe620c 100644
--- a/python-pytest-mock.changes
+++ b/python-pytest-mock.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Fri Jul 26 12:26:36 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Remove mock30.patch for now as we are not able to upgrade
+  to mock3 yet
+
+-------------------------------------------------------------------
+Thu Jul 18 08:52:38 UTC 2019 - Ondřej Súkup <mimi.vx@gmail.com>
+
+- add upstream patch to test with pytest5 - fix_tests.patch 
+
+-------------------------------------------------------------------
+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..953cb64 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
+Patch1:         fix_tests.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}
+%autopatch -p1
 
 %build
 %python_build