diff --git a/pytest5.patch b/pytest5.patch
new file mode 100644
index 0000000..3a87a4d
--- /dev/null
+++ b/pytest5.patch
@@ -0,0 +1,21 @@
+From 97207a9e88f906cf8e4198aec20b24ef97764486 Mon Sep 17 00:00:00 2001
+From: Seth Michael Larson <lars4839@umn.edu>
+Date: Fri, 22 Nov 2019 10:50:51 -0600
+Subject: [PATCH] Automatically merge Dependabot PRs with Mergify (#175)
+
+---
+ test/test_table.py    |  2 +-
+ 5 files changed, 14 insertions(+), 11 deletions(-)
+
+index d77c30a..ca4729b 100644
+--- a/test/test_table.py
++++ b/test/test_table.py
+@@ -46,7 +46,7 @@ def test_get_by_index_out_of_range(self):
+             tbl.get_by_index(off + 2)
+ 
+         assert (
+-            "InvalidTableIndex: Invalid table index %d" % (off + 2) in str(e)
++            "Invalid table index %d" % (off + 2) in str(e.value)
+         )
+ 
+     def test_repr(self):
diff --git a/python-hpack.changes b/python-hpack.changes
index 394cdef..f879e97 100644
--- a/python-hpack.changes
+++ b/python-hpack.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May  6 07:37:26 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Add patch to work with pytest5:
+  * pytest5.patch
+
 -------------------------------------------------------------------
 Wed Jan 15 13:24:22 UTC 2020 - Ondřej Súkup <mimi.vx@gmail.com>
 
diff --git a/python-hpack.spec b/python-hpack.spec
index 393e087..8986e87 100644
--- a/python-hpack.spec
+++ b/python-hpack.spec
@@ -25,9 +25,9 @@ License:        MIT
 URL:            https://github.com/python-hyper/hpack
 Source:         https://files.pythonhosted.org/packages/source/h/hpack/hpack-%{version}.tar.gz
 Patch0:         healthcheck.patch
+Patch1:         pytest5.patch
 BuildRequires:  %{python_module hypothesis}
-# https://github.com/python-hyper/hpack/issues/168
-BuildRequires:  %{python_module pytest < 5.0}
+BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
@@ -41,7 +41,7 @@ automatically enables the use of nghttp2 if it’s available.
 
 %prep
 %setup -q -n hpack-%{version}
-%patch0 -p1
+%autopatch -p1
 
 %build
 export LC_ALL="en_US.UTF-8"