diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
index 724c530..0e7d866 100644
--- a/Lib/test/test_posixpath.py
+++ b/Lib/test/test_posixpath.py
@@ -318,7 +318,8 @@
                 # expanduser should fall back to using the password database
                 del env['HOME']
                 home = pwd.getpwuid(os.getuid()).pw_dir
-                self.assertEqual(posixpath.expanduser("~"), home)
+                # $HOME can end with a trailing /, so strip it (see #17809)
+                self.assertEqual(posixpath.expanduser("~"), home.rstrip("/"))
 
     def test_normpath(self):
         self.assertEqual(posixpath.normpath(""), ".")
diff --git a/Misc/ACKS b/Misc/ACKS
index ed30056..90913ac 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -648,6 +648,7 @@
 Lenny Kneler
 Pat Knight
 Jeff Knupp
+Kubilay Kocak
 Greg Kochanski
 Damon Kohler
 Marko Kohtala