diff --git a/main/python3/APKBUILD b/main/python3/APKBUILD
index e722d8fa47f..3f47ce7a708 100644
--- a/main/python3/APKBUILD
+++ b/main/python3/APKBUILD
@@ -23,6 +23,7 @@ source="https://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.xz
 	custom-bluetooth-h-path.patch
 	arm-alignment.patch
 	mpdecimal-2.5.1.patch
+	test_nntplib.patch
 	"
 builddir="$srcdir/Python-$pkgver"
 
@@ -189,4 +190,5 @@ e19d15d3a478a7af47c1921c8827843492e38787b1182152155bd3d8ad9e1d8ee25c5fda1f24e38c
 ab8eaa2858d5109049b1f9f553198d40e0ef8d78211ad6455f7b491af525bffb16738fed60fc84e960c4889568d25753b9e4a1494834fea48291b33f07000ec2  musl-find_library.patch
 d489b5d5f374e2b298954a2388771e500c6cf9b274012e06b3e71a34aa85c354369b3fa2a37c3121808075c1f1f340a9fa097996c149399e10b9424170211d90  custom-bluetooth-h-path.patch
 a84483246e413650a904c34c18f5e4f4168c39067d069f48557c330de6eb3db19fd96a4d453d742db3dcb7c7f962722903f62823c752ff90510c89830435ffc0  arm-alignment.patch
-d95e36ef3c315a2ddf689c9319e027cf56e8817b0cae139e3ade4742ab6f9efcb3cc4adca178e9bbc8757bd0e3fb924ac2b37e66e70eaa7288202a25339eed7d  mpdecimal-2.5.1.patch"
+d95e36ef3c315a2ddf689c9319e027cf56e8817b0cae139e3ade4742ab6f9efcb3cc4adca178e9bbc8757bd0e3fb924ac2b37e66e70eaa7288202a25339eed7d  mpdecimal-2.5.1.patch
+f0b2da4937cac618c40b9e2b6e332de321cd6d292820f11a74122a6c1440f4dadc73dead6a1cf07ea54af3c4db66e0ba38af83f139f7d5f77d479c179376139d  test_nntplib.patch"
diff --git a/main/python3/test_nntplib.patch b/main/python3/test_nntplib.patch
new file mode 100644
index 00000000000..d1d94031fd0
--- /dev/null
+++ b/main/python3/test_nntplib.patch
@@ -0,0 +1,34 @@
+diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py
+index fbd7db03defb1..89a2004dfb139 100644
+--- a/Lib/test/test_nntplib.py
++++ b/Lib/test/test_nntplib.py
+@@ -82,7 +82,7 @@ def _check_desc(desc):
+         desc = self.server.description(self.GROUP_NAME)
+         _check_desc(desc)
+         # Another sanity check
+-        self.assertIn("Python", desc)
++        self.assertIn(self.DESC, desc)
+         # With a pattern
+         desc = self.server.description(self.GROUP_PAT)
+         _check_desc(desc)
+@@ -299,6 +299,7 @@ class NetworkedNNTPTests(NetworkedNNTPTestsMixin, unittest.TestCase):
+     NNTP_HOST = 'news.trigofacile.com'
+     GROUP_NAME = 'fr.comp.lang.python'
+     GROUP_PAT = 'fr.comp.lang.*'
++    DESC = 'Python'
+ 
+     NNTP_CLASS = NNTP
+ 
+@@ -332,8 +333,11 @@ class NetworkedNNTP_SSLTests(NetworkedNNTPTests):
+     # 400 connections per day are accepted from each IP address."
+ 
+     NNTP_HOST = 'nntp.aioe.org'
+-    GROUP_NAME = 'comp.lang.python'
+-    GROUP_PAT = 'comp.lang.*'
++    # bpo-42794: aioe.test is one of the official groups on this server
++    # used for testing: https://news.aioe.org/manual/aioe-hierarchy/
++    GROUP_NAME = 'aioe.test'
++    GROUP_PAT = 'aioe.*'
++    DESC = 'test'
+ 
+     NNTP_CLASS = getattr(nntplib, 'NNTP_SSL', None)