diff --git a/python-kafka-python.changes b/python-kafka-python.changes
index e41dab1..82abca8 100644
--- a/python-kafka-python.changes
+++ b/python-kafka-python.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Oct 12 02:26:13 UTC 2022 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Add patch remove-mock.patch:
+  * Remove use of mock. 
+
 -------------------------------------------------------------------
 Tue Sep  6 14:12:44 UTC 2022 - John Vandenberg <jayvdb@gmail.com>
 
diff --git a/python-kafka-python.spec b/python-kafka-python.spec
index 26f1ef8..9f7bf35 100644
--- a/python-kafka-python.spec
+++ b/python-kafka-python.spec
@@ -29,6 +29,8 @@ Source1:        https://raw.githubusercontent.com/dpkp/kafka-python/master/serve
 Source2:        https://raw.githubusercontent.com/dpkp/kafka-python/master/test/conftest.py
 Source3:        https://raw.githubusercontent.com/dpkp/kafka-python/master/test/fixtures.py
 Source4:        https://raw.githubusercontent.com/dpkp/kafka-python/master/test/service.py
+# PATCH-FIX-OPENSUSE Remove use of mock module
+Patch0:         remove-mock.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
@@ -39,7 +41,6 @@ Suggests:       python-xxhash
 BuildArch:      noarch
 # SECTION test requirements
 BuildRequires:  %{python_module lz4}
-BuildRequires:  %{python_module mock}
 BuildRequires:  %{python_module pytest-mock}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module python-snappy}
@@ -55,7 +56,7 @@ protocol as well as broker-aware request routing. Gzip and Snappy compression
 is also supported for message sets.
 
 %prep
-%setup -q -n kafka-python-%{version}
+%autosetup -p1 -n kafka-python-%{version}
 mkdir -p servers/0.11.0.2/resources/
 cp %{SOURCE1} servers/0.11.0.2/resources/
 
diff --git a/remove-mock.patch b/remove-mock.patch
new file mode 100644
index 0000000..868c35f
--- /dev/null
+++ b/remove-mock.patch
@@ -0,0 +1,32 @@
+Index: kafka-python-2.0.2/test/test_consumer_integration.py
+===================================================================
+--- kafka-python-2.0.2.orig/test/test_consumer_integration.py
++++ kafka-python-2.0.2/test/test_consumer_integration.py
+@@ -1,7 +1,10 @@
+ import logging
+ import time
+ 
+-from mock import patch
++try:
++    from unittest.mock import patch
++except ImportError:
++    from mock import patch
+ import pytest
+ from kafka.vendor.six.moves import range
+ 
+Index: kafka-python-2.0.2/test/test_conn.py
+===================================================================
+--- kafka-python-2.0.2.orig/test/test_conn.py
++++ kafka-python-2.0.2/test/test_conn.py
+@@ -4,7 +4,10 @@ from __future__ import absolute_import
+ from errno import EALREADY, EINPROGRESS, EISCONN, ECONNRESET
+ import socket
+ 
+-import mock
++try:
++    from unittest import mock
++except ImportError:
++    import mock
+ import pytest
+ 
+ from kafka.conn import BrokerConnection, ConnectionStates, collect_hosts