diff --git a/pytest5.patch b/pytest5.patch
new file mode 100644
index 0000000..6879449
--- /dev/null
+++ b/pytest5.patch
@@ -0,0 +1,13 @@
+Index: pip-19.1.1+git.1557777841.63878672/tests/unit/test_wheel.py
+===================================================================
+--- pip-19.1.1+git.1557777841.63878672.orig/tests/unit/test_wheel.py
++++ pip-19.1.1+git.1557777841.63878672/tests/unit/test_wheel.py
+@@ -378,7 +378,7 @@ def test_check_compatibility():
+     # test raises with correct error
+     with pytest.raises(UnsupportedWheel) as e:
+         wheel.check_compatibility(higher_v, name)
+-    assert 'is not compatible' in str(e)
++    assert 'is not compatible' in str(e.value)
+ 
+     # Should only log.warning - minor version is greater
+     higher_v = (vc[0], vc[1] + 1)
diff --git a/python-pip.changes b/python-pip.changes
index 5d51ca9..4894f1c 100644
--- a/python-pip.changes
+++ b/python-pip.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul 22 08:24:11 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Add patch to build with pytest5, also sent upstream:
+  * pytest5.patch
+
 -------------------------------------------------------------------
 Wed May 15 14:15:56 UTC 2019 - Matej Cepl <mcepl@cepl.eu>
 
diff --git a/python-pip.spec b/python-pip.spec
index fae0a3d..d5f0c1c 100644
--- a/python-pip.spec
+++ b/python-pip.spec
@@ -34,6 +34,7 @@ Group:          Development/Languages/Python
 URL:            http://www.pip-installer.org
 Source:         pip-%{version}.tar.xz
 Patch0:         pip-shipped-requests-cabundle.patch
+Patch1:         pytest5.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
@@ -71,6 +72,7 @@ pip-installable as well.
 %prep
 %setup -q -n pip-%{version}
 %patch0 -p1
+%patch1 -p1
 # remove shebangs verbosely (if only sed would offer a verbose mode...)
 for f in $(find src -name \*.py -exec grep -l '^#!%{_bindir}/env' {} \;); do
     sed -i 's|^#!%{_bindir}/env .*$||g' $f