diff --git a/fix-tests.patch b/fix-tests.patch
new file mode 100644
index 0000000..7508573
--- /dev/null
+++ b/fix-tests.patch
@@ -0,0 +1,90 @@
+diff --git a/src/restview/tests.py b/src/restview/tests.py
+index 71aeb77..c840cb8 100644
+--- a/src/restview/tests.py
++++ b/src/restview/tests.py
+@@ -541,10 +541,9 @@ def doctest_RestViewer_rest_to_html():
+         ... ''', settings={'cloak_email_addresses': True}).strip())
+         ... # doctest: +ELLIPSIS,+REPORT_NDIFF
+         <?xml version="1.0" encoding="utf-8" ?>
+-        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
++        <!DOCTYPE html...>
+         <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+         <head>
+-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+         ...
+         <title>example</title>
+         <style type="text/css">
+@@ -556,7 +555,7 @@ def doctest_RestViewer_rest_to_html():
+         </style>
+         </head>
+         <body>
+-        <div class="document" id="example">
++        <main id="example">
+         <h1 class="title">example</h1>
+         <BLANKLINE>
+         <p>This is a doctest:</p>
+@@ -570,11 +569,9 @@ def doctest_RestViewer_rest_to_html():
+         <p>This is a reference: <a class="reference external" href="http://example.com/README.rst">README.rst</a></p>
+         <p>This is an email: <a class="reference external" href="mailto:marius&#37;&#52;&#48;gedmin&#46;as">marius<span>&#64;</span>gedmin<span>&#46;</span>as</a></p>
+         <p>This is a literal block:</p>
+-        <pre class="literal-block">
+-        See <a href="CHANGES.rst">CHANGES.rst</a>, mkay?
+-        </pre>
++        <pre class="literal-block">See <a href="CHANGES.rst">CHANGES.rst</a>, mkay?</pre>
+         <p>This is an inline literal: <tt class="docutils literal"><a href="README.txt">README.txt</a></tt>.</p>
+-        </div>
++        </main>
+         </body>
+         </html>
+ 
+@@ -594,10 +591,7 @@ def doctest_RestViewer_rest_to_html_css_url():
+         ... ''').strip())
+         ... # doctest: +ELLIPSIS,+REPORT_NDIFF
+         <?xml version="1.0" encoding="utf-8" ?>
+-        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+-        <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+-        <head>
+-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
++        <!DOCTYPE html...>
+         ...
+         <title>...</title>
+         <link rel="stylesheet" href="http://example.com/my.css" type="text/css" />
+@@ -606,11 +600,11 @@ def doctest_RestViewer_rest_to_html_css_url():
+         </style>
+         </head>
+         <body>
+-        <div class="document">
++        <main>
+         <BLANKLINE>
+         <BLANKLINE>
+         <p>Some text</p>
+-        </div>
++        </main>
+         </body>
+         </html>
+ 
+@@ -729,21 +723,18 @@ def doctest_RestViewer_rest_to_html_pypi_strict():
+         ... ''').strip().replace("&quot;", '"'))
+         ... # doctest: +ELLIPSIS,+REPORT_NDIFF
+         <?xml version="1.0" encoding="utf-8" ?>
+-        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+-        <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+-        <head>
+-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
++        <!DOCTYPE html...>
+         ...
+         <title>Hello</title>
+         <style type="text/css">
+         ...
+         </head>
+         <body>
+-        <div class="document" id="hello">
++        <main id="hello">
+         <h1 class="title">Hello</h1>
+         <BLANKLINE>
+         <p><a href="http://www.example.com" rel="nofollow">This is fine</a>.</p>
+-        </div>
++        </main>
+         </body>
+         </html>
+ 
diff --git a/python-restview.changes b/python-restview.changes
index 746d4ed..be5d9df 100644
--- a/python-restview.changes
+++ b/python-restview.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  2 09:54:28 UTC 2022 - Daniel Garcia <daniel.garcia@suse.com>
+
+- Add fix-tests.patch gh#mgedmin/restview@5033eacb1d55
+- Remove python_module macro definition
+- More specific python_sitelib in %files
+- Use autosetup instead of setup + autopatch
+
 -------------------------------------------------------------------
 Thu Apr 14 07:20:58 UTC 2022 - pgajdos@suse.com
 
diff --git a/python-restview.spec b/python-restview.spec
index da72ddd..ca241d4 100644
--- a/python-restview.spec
+++ b/python-restview.spec
@@ -16,7 +16,6 @@
 #
 
 
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-restview
 Version:        3.0.0
 Release:        0
@@ -25,6 +24,8 @@ License:        GPL-3.0-only
 Group:          Development/Languages/Python
 URL:            https://mg.pov.lt/restview/
 Source:         https://files.pythonhosted.org/packages/source/r/restview/restview-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM fix-tests.patch gh#mgedmin/restview@5033eacb1d55
+Patch1:         fix-tests.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
@@ -46,8 +47,7 @@ BuildRequires:  %{python_module readme_renderer}
 A viewer for ReStructuredText documents that renders them on the fly.
 
 %prep
-%setup -q -n restview-%{version}
-%autopatch -p1
+%autosetup -p1 -n restview-%{version}
 
 %build
 %python_build
@@ -70,6 +70,7 @@ A viewer for ReStructuredText documents that renders them on the fly.
 %doc CHANGES.rst README.rst
 %license LICENSE
 %python_alternative %{_bindir}/restview
-%{python_sitelib}/*
+%{python_sitelib}/restview
+%{python_sitelib}/restview-%{version}*-info
 
 %changelog
