diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
index 11e6fb45965..d30d5eed094 100644
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -649,7 +649,7 @@ def _testFile(self, filename):
         return roundtrip(open(path, 'rb'))
 
     def test_utf8_coding_cookie_and_no_utf8_bom(self):
-        f = 'tokenize_tests-utf8-coding-cookie-and-utf8-bom-sig.txt'
+        f = 'tokenize_tests-utf8-coding-cookie-and-no-utf8-bom-sig.txt'
         self.assertTrue(self._testFile(f))
 
     def test_latin1_coding_cookie_and_utf8_bom(self):
diff --git a/Lib/test/tokenize_tests-utf8-coding-cookie-and-no-utf8-bom-sig.txt b/Lib/test/tokenize_tests-utf8-coding-cookie-and-no-utf8-bom-sig.txt
index d8e6c803d5a..04561e48472 100644
--- a/Lib/test/tokenize_tests-utf8-coding-cookie-and-no-utf8-bom-sig.txt
+++ b/Lib/test/tokenize_tests-utf8-coding-cookie-and-no-utf8-bom-sig.txt
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 # IMPORTANT: unlike the other test_tokenize-*.txt files, this file
 # does NOT have the utf-8 BOM signature '\xef\xbb\xbf' at the start
 # of it.  Make sure this is not added inadvertently by your editor
diff --git a/Misc/ACKS b/Misc/ACKS
index da13b93787e..1e9a721911a 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1030,6 +1030,7 @@ Gordon Worley
 Thomas Wouters
 Heiko Wundram
 Doug Wyatt
+Robert Xiao
 Florent Xicluna
 Hirokazu Yamamoto
 Ka-Ping Yee
diff --git a/Misc/NEWS b/Misc/NEWS
index c826ae10d40..9e63beb82e0 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1058,6 +1058,9 @@ Extension Modules
 Tests
 -----
 
+- Issue #12587: Correct faulty test file and reference in test_tokenize.
+  (Patch by Robert Xiao)
+
 - Issue #12573: Add resource checks for dangling Thread and Process objects.
 
 - Issue #12549: Correct test_platform to not fail when OS X returns 'x86_64'