diff --git a/python-sphinxcontrib-blockdiag.changes b/python-sphinxcontrib-blockdiag.changes
index 64d5d31..7f05e23 100644
--- a/python-sphinxcontrib-blockdiag.changes
+++ b/python-sphinxcontrib-blockdiag.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 10 06:32:23 UTC 2022 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Add patch remove-mock.patch. 
+
 -------------------------------------------------------------------
 Thu Sep 29 10:26:09 UTC 2022 - Daniel Garcia <daniel.garcia@suse.com>
 
diff --git a/python-sphinxcontrib-blockdiag.spec b/python-sphinxcontrib-blockdiag.spec
index 2ce8975..8127ddb 100644
--- a/python-sphinxcontrib-blockdiag.spec
+++ b/python-sphinxcontrib-blockdiag.spec
@@ -38,10 +38,10 @@ URL:            https://github.com/blockdiag/sphinxcontrib-blockdiag
 # Use the github tag instead of the pythonhosted.org to get the tests folder
 Source:         https://github.com/blockdiag/sphinxcontrib-blockdiag/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 # PATCH-FEATURE-UPSTREAM 25.patch gh#blockdiag/sphinxcontrib-blockdiag#25
-Patch:          https://patch-diff.githubusercontent.com/raw/blockdiag/sphinxcontrib-blockdiag/pull/25.patch
+Patch0:         https://patch-diff.githubusercontent.com/raw/blockdiag/sphinxcontrib-blockdiag/pull/25.patch
+Patch1:         remove-mock.patch
 BuildRequires:  %{python_module Sphinx >= 2.0}
 BuildRequires:  %{python_module blockdiag >= 1.5.0}
-BuildRequires:  %{python_module mock}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
@@ -51,7 +51,6 @@ BuildArch:      noarch
 %if %{with test}
 BuildRequires:  %{python_module Sphinx-latex}
 BuildRequires:  %{python_module funcparserlib}
-BuildRequires:  %{python_module mock}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module sphinxcontrib-blockdiag = %{version}}
 %endif
diff --git a/remove-mock.patch b/remove-mock.patch
new file mode 100644
index 0000000..918b7af
--- /dev/null
+++ b/remove-mock.patch
@@ -0,0 +1,12 @@
+Index: sphinxcontrib-blockdiag-3.0.0/tests/test_errors.py
+===================================================================
+--- sphinxcontrib-blockdiag-3.0.0.orig/tests/test_errors.py
++++ sphinxcontrib-blockdiag-3.0.0/tests/test_errors.py
+@@ -1,6 +1,6 @@
+ # -*- coding: utf-8 -*-
+ 
+-from mock import patch
++from unittest.mock import patch
+ 
+ import os
+ import sys