diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
@@ -668,7 +668,7 @@ def c_locale_get_error_handler(self, isolated=False, encoding=None):
            'dump("stdout")',
            'dump("stderr")',
        ))
-        args = [sys.executable, "-c", code]
        if isolated:
            args.append("-I")
        if encoding is not None:
@@ -712,8 +712,8 @@ def test_c_locale_surrogateescape(self):
        # have no any effect
        out = self.c_locale_get_error_handler(encoding=':')
        self.assertEqual(out,
-                         'stdin: strict\n'
-                         'stdout: strict\n'
                         'stderr: backslashreplace\n')
        out = self.c_locale_get_error_handler(encoding='')
        self.assertEqual(out,

diff --git a/Lib/test/test_utf8_mode.py b/Lib/test/test_utf8_mode.py
@@ -139,16 +139,16 @@ def test_stdio(self):
        out = self.get_output('-X', 'utf8', '-c', code,
                              PYTHONIOENCODING="latin1")
        self.assertEqual(out.splitlines(),
-                         ['stdin: latin1/strict',
-                          'stdout: latin1/strict',
-                          'stderr: latin1/backslashreplace'])

        out = self.get_output('-X', 'utf8', '-c', code,
                              PYTHONIOENCODING=":namereplace")
        self.assertEqual(out.splitlines(),
-                         ['stdin: UTF-8/namereplace',
-                          'stdout: UTF-8/namereplace',
-                          'stderr: UTF-8/backslashreplace'])

    def test_io(self):
        code = textwrap.dedent('''

diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-08-28-17-48-40.bpo-34485.aFwck2.rst b/Misc/NEWS.d/next/Core and Builtins/2018-08-28-17-48-40.bpo-34485.aFwck2.rst
@@ -0,0 +1,5 @@
diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-08-28-23-01-14.bpo-34485.dq1Kqk.rst b/Misc/NEWS.d/next/Core and Builtins/2018-08-28-23-01-14.bpo-34485.dq1Kqk.rst
@@ -0,0 +1,3 @@
diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c
@@ -319,7 +319,7 @@ PyLocale_strxfrm(PyObject* self, PyObject* args)
static PyObject*
PyLocale_getdefaultlocale(PyObject* self, PyObject *Py_UNUSED(ignored))
{
-    char encoding[100];
    char locale[100];

    PyOS_snprintf(encoding, sizeof(encoding), "cp%d", GetACP());