diff --git a/0001-Replace-use-of-pytest-get_marker.patch b/0001-Replace-use-of-pytest-get_marker.patch
new file mode 100644
index 0000000..0ff1cb5
--- /dev/null
+++ b/0001-Replace-use-of-pytest-get_marker.patch
@@ -0,0 +1,32 @@
+From 3d0faa10762a803d4a75e658956b5aa72bef39be Mon Sep 17 00:00:00 2001
+From: Simo Sorce <simo@redhat.com>
+Date: Wed, 10 Jul 2019 10:46:59 -0400
+Subject: [PATCH] Replace use of pytest get_marker
+
+get_marker has been removed in pytest 4, so replace it with theiur
+suggested work around.
+
+Signed-off-by: Simo Sorce <simo@redhat.com>
+---
+ tests/conftest.py | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/tests/conftest.py b/tests/conftest.py
+index c25e302..2dc7158 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -34,6 +34,8 @@ def pytest_addoption(parser):
+ 
+ def pytest_runtest_setup(item):
+     skip_servertest = item.config.getoption(SKIP_SERVERTEST)
+-    if skip_servertest and item.get_marker("servertest") is not None:
+-        # args has --skip-servertests and test is marked as servertest
+-        pytest.skip("Skip integration test")
++    if skip_servertest:
++        for marker in item.iter_markers():
++            if marker.name == "servertest":
++                # args has --skip-servertests and test is marked as servertest
++                pytest.skip("Skip integration test")
+-- 
+2.21.0
+
diff --git a/custodia.spec b/custodia.spec
index f866d5c..1fc1903 100644
--- a/custodia.spec
+++ b/custodia.spec
@@ -16,7 +16,7 @@
 
 Name:           custodia
 Version:        0.6.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A service to manage, retrieve and store secrets for other processes
 
 License:        GPLv3+
@@ -28,6 +28,7 @@ Source4:        custodia@.socket
 Source5:        custodia.tmpfiles.conf
 
 Patch1:         nonfatal_deprecation.patch
+Patch2:         0001-Replace-use-of-pytest-get_marker.patch
 
 BuildArch:      noarch
 
@@ -253,6 +254,9 @@ exit 0
 
 
 %changelog
+* Wed Jul 10 2019 Simo Sorce <simo@fedoraproject.org> - 0.6.0-7
+- Add patch to deal with pytest4 upgrade in future fedora
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild