diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
index 1f050505a79..412849cff3a 100644
--- a/Lib/test/test_posixpath.py
+++ b/Lib/test/test_posixpath.py
@@ -261,7 +261,8 @@ def test_expanduser(self):
                 # 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 c79e21c7b81..5f5b84bc319 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -660,6 +660,7 @@ Kim Knapp
 Lenny Kneler
 Pat Knight
 Jeff Knupp
+Kubilay Kocak
 Greg Kochanski
 Damon Kohler
 Marko Kohtala