diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py
index 489ceef..4cff870 100644
--- a/Lib/test/test_gdb.py
+++ b/Lib/test/test_gdb.py
@@ -59,7 +59,7 @@
         out, err = subprocess.Popen(
             args, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
             ).communicate()
-        return out.decode('utf-8'), err.decode('utf-8')
+        return out.decode('utf-8', 'replace'), err.decode('utf-8', 'replace')
 
     def get_stack_trace(self, source=None, script=None,
                         breakpoint=BREAKPOINT_FN,
diff --git a/Misc/NEWS b/Misc/NEWS
index 34cb5bd..128f305 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1142,8 +1142,8 @@
 - Issue #8108: test_ftplib's non-blocking SSL server now has proper handling
   of SSL shutdowns.
 
-- Issues #8279, #8330, #8437, #8480: Fix test_gdb failures, patch written by
-  Dave Malcolm
+- Issues #8279, #8330, #8437, #8480, #8495: Fix test_gdb failures, patch
+  written by Dave Malcolm
 
 - Issue #3864: Skip three test_signal tests on freebsd6 because they fail
   if any thread was previously started, most likely due to a platform bug.