diff --git a/python-unittest-xml-reporting.changes b/python-unittest-xml-reporting.changes
index 71be6d5..1f74f87 100644
--- a/python-unittest-xml-reporting.changes
+++ b/python-unittest-xml-reporting.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct  2 09:11:10 UTC 2019 - Matej Cepl <mcepl@suse.com>
+
+- Skip test_xmlrunner_non_ascii failing with Python 3.8
+
 -------------------------------------------------------------------
 Fri Apr 12 09:06:13 UTC 2019 - Marketa Calabkova <mcalabkova@suse.com>
 
diff --git a/python-unittest-xml-reporting.spec b/python-unittest-xml-reporting.spec
index 332d229..aeb982f 100644
--- a/python-unittest-xml-reporting.spec
+++ b/python-unittest-xml-reporting.spec
@@ -23,12 +23,15 @@ Release:        0
 Summary:        PyUnit-based test runner with JUnit like XML reporting
 License:        LGPL-3.0-or-later
 Group:          Development/Languages/Python
-URL:            http://github.com/danielfm/unittest-xml-reporting/tree/master/
+URL:            http://github.com/danielfm/unittest-xml-reporting
 Source:         https://github.com/xmlrunner/unittest-xml-reporting/archive/%{version}.tar.gz
 BuildRequires:  %{python_module lxml}
-BuildRequires:  %{python_module mock}
+BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module six >= 1.4.0}
+%ifpython2
+BuildRequires:  python2-mock
+%endif
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-six >= 1.4.0
@@ -52,7 +55,7 @@ systems, IDEs and continuous integration servers.
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
-%python_expand $python -m unittest discover
+%pytest -k 'not test_xmlrunner_non_ascii'
 
 %files %{python_files}
 %doc README.md