diff --git a/python-pygal.changes b/python-pygal.changes
index 71e70e6..70745ac 100644
--- a/python-pygal.changes
+++ b/python-pygal.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jul 19 12:31:24 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Add patch to work with python 3.8:
+  * python38.patch
+- Restrict pytest to < 3.0 as the testing code does not work
+  upstream on anything else
+
 -------------------------------------------------------------------
 Tue Mar 26 09:21:16 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/python-pygal.spec b/python-pygal.spec
index 286b946..5a57b16 100644
--- a/python-pygal.spec
+++ b/python-pygal.spec
@@ -26,6 +26,7 @@ Group:          Development/Languages/Python
 URL:            http://pygal.org/
 Source:         https://files.pythonhosted.org/packages/source/p/pygal/pygal-%{version}.tar.gz
 Source10:       https://raw.githubusercontent.com/Kozea/pygal/%{version}/COPYING
+Patch0:         python38.patch
 BuildRequires:  %{python_module Flask}
 BuildRequires:  %{python_module lxml}
 BuildRequires:  %{python_module pyquery}
@@ -42,7 +43,8 @@ Recommends:     python-CairoSVG
 %endif
 # SECTION test requirements
 BuildRequires:  %{python_module pytest-runner}
-BuildRequires:  %{python_module pytest}
+# https://github.com/Kozea/pygal/pull/340
+BuildRequires:  %{python_module pytest < 4.0}
 # /SECTION
 %python_subpackages
 
@@ -52,6 +54,7 @@ It supports various chart types and CSS styling.
 
 %prep
 %setup -q -n pygal-%{version}
+%patch0 -p1
 cp %{SOURCE10} .
 
 %build
diff --git a/python38.patch b/python38.patch
new file mode 100644
index 0000000..44ad45e
--- /dev/null
+++ b/python38.patch
@@ -0,0 +1,30 @@
+From 45be172a9b5ce6fcf8bab89685ea88955192d474 Mon Sep 17 00:00:00 2001
+From: Dooley_labs <elderlabs@users.noreply.github.com>
+Date: Mon, 15 Jul 2019 04:57:57 -0400
+Subject: [PATCH] Patch Python 3.8 deprecation warning
+
+This warning has been plaguing me. This fixes it. Forever.
+```
+py.warnings:110 - .../pygal/_compat.py:23: DeprecationWarning: Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated, and in 3.8 it will stop working
+```
+---
+ pygal/_compat.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/pygal/_compat.py b/pygal/_compat.py
+index 07ab8846..2c6ab12b 100644
+--- a/pygal/_compat.py
++++ b/pygal/_compat.py
+@@ -20,8 +20,11 @@
+ from __future__ import division
+ 
+ import sys
+-from collections import Iterable
+ from datetime import datetime, timedelta, tzinfo
++try:
++    from collections.abc import Iterable
++except ImportError:
++    from collections import Iterable
+ 
+ if sys.version_info[0] == 3:
+     base = (str, bytes)