diff --git a/exclude-tests.patch b/exclude-tests.patch
index f7c653a..ef13e26 100644
--- a/exclude-tests.patch
+++ b/exclude-tests.patch
@@ -1,13 +1,21 @@
-diff --git a/setup.py b/setup.py
-index e65ffcf..51c8220 100644
+From 4ca1b1aa3831d886485f66c437681a4bf276f64b Mon Sep 17 00:00:00 2001
+From: Shaumyadeep Chaudhuri <shaumya@gmail.com>
+Date: Wed, 2 Aug 2023 20:37:12 +0200
+Subject: [PATCH] Update setup.py
+
+Exclude tests being grabbed by find_packages
+---
+ setup.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/setup.py
 +++ b/setup.py
-@@ -11,7 +11,7 @@ Proton VPN NetworkManager library for Linux clients.
+@@ -11,7 +11,7 @@ Proton VPN NetworkManager library for Li
  setup(
      name="protonvpn-nm-lib",
      version=APP_VERSION,
 -    packages=find_packages(),
-+    packages=find_packages(exclude=["tests"]),
++    packages=find_packages(exclude=["tests", "tests.*"]),
      description="Proton VPN NetworkManager Linux library",
      author="Proton Technologies AG",
      author_email="contact@protonvpn.com",
diff --git a/python-protonvpn-nm-lib.changes b/python-protonvpn-nm-lib.changes
index de125e9..4e36f11 100644
--- a/python-protonvpn-nm-lib.changes
+++ b/python-protonvpn-nm-lib.changes
@@ -2,6 +2,7 @@
 Mon Sep 25 14:37:24 UTC 2023 - Matej Cepl <mcepl@suse.com>
 
 - Clean up the SPEC file
+- Add exclude-tests.patch (from gh#ProtonVPN/protonvpn-nm-lib!25)
 
 -------------------------------------------------------------------
 Mon Sep 25 12:51:55 UTC 2023 - Alexandre Vicenzi <alexandre.vicenzi@suse.com>
diff --git a/python-protonvpn-nm-lib.spec b/python-protonvpn-nm-lib.spec
index b821249..dcc3329 100644
--- a/python-protonvpn-nm-lib.spec
+++ b/python-protonvpn-nm-lib.spec
@@ -27,7 +27,9 @@ License:        GPL-3.0-or-later
 Group:          Development/Languages/Python
 URL:            https://github.com/ProtonVPN/protonvpn-nm-lib
 Source:         https://github.com/ProtonVPN/protonvpn-nm-lib/archive/refs/tags/%{version}.tar.gz#/protonvpn-nm-lib-%{version}.tar.gz
-Patch1:         exclude-tests.patch
+# PATCH-FIX-UPSTREAM exclude-tests.patch gh#ProtonVPN/protonvpn-nm-lib!25 mcepl@suse.com
+# Exlcude tests being grabbed by find_packeges during setup
+Patch0:         exclude-tests.patch
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module pyxdg}
 BuildRequires:  %{python_module wheel}