diff --git a/Lib/test/test_tabnanny.py b/Lib/test/test_tabnanny.py
index 845096e63c2..81549d14ae2 100644
--- a/Lib/test/test_tabnanny.py
+++ b/Lib/test/test_tabnanny.py
@@ -6,6 +6,8 @@ Glossary:
 from unittest import TestCase, mock
 from unittest import mock
 import errno
+import os
+import sys
 import tabnanny
 import tokenize
 import tempfile
@@ -233,8 +235,8 @@ class TestCheck(TestCase):
     def test_when_no_file(self):
         """A python file which does not exist actually in system."""
         path = 'no_file.py'
-        err = f"{path!r}: I/O Error: [Errno {errno.ENOENT}] " \
-              f"No such file or directory: {path!r}\n"
+        err = (f"{path!r}: I/O Error: [Errno {errno.ENOENT}] "
+              f"{os.strerror(errno.ENOENT)}: {path!r}\n")
         self.verify_tabnanny_check(path, err=err)
 
     def test_errored_directory(self):
diff --git a/Misc/NEWS.d/next/Tests/2019-04-01-16-06-36.bpo-31904.peaceF.rst b/Misc/NEWS.d/next/Tests/2019-04-01-16-06-36.bpo-31904.peaceF.rst
new file mode 100644
index 00000000000..6297717e0fc
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-04-01-16-06-36.bpo-31904.peaceF.rst
@@ -0,0 +1 @@
+Fix test_tabnanny on VxWorks: adjust ENOENT error message.