diff --git a/gdb/testsuite/gdb.server/no-thread-db.exp b/gdb/testsuite/gdb.server/no-thread-db.exp
index 9cbe962bc3c..f1d91e728be 100644
--- a/gdb/testsuite/gdb.server/no-thread-db.exp
+++ b/gdb/testsuite/gdb.server/no-thread-db.exp
@@ -49,7 +49,7 @@ gdbserver_run ""
 
 # Force gdbserver to fail to load libthread_db.
 gdb_test "monitor set libthread-db-search-path ${unresolvable_thread_db_path}" \
-    "libthread-db-search-path set to `${unresolvable_thread_db_path}'" \
+    "libthread-db-search-path set to \"${unresolvable_thread_db_path}\"" \
     "libthread-db is now unresolvable"
 
 # Continue past tls assignment to make sure tls storage is allocated.
diff --git a/gdbserver/thread-db.cc b/gdbserver/thread-db.cc
index af39a58154e..fd3928b7d2c 100644
--- a/gdbserver/thread-db.cc
+++ b/gdbserver/thread-db.cc
@@ -855,9 +855,9 @@ thread_db_handle_monitor_command (const char *mon)
 	cp = LIBTHREAD_DB_SEARCH_PATH;
       libthread_db_search_path = xstrdup (cp);
 
-      monitor_output ("libthread-db-search-path set to `");
+      monitor_output ("libthread-db-search-path set to \"");
       monitor_output (libthread_db_search_path);
-      monitor_output ("'\n");
+      monitor_output ("\"\n");
       return 1;
     }
 
diff --git a/gdbserver/tracepoint.cc b/gdbserver/tracepoint.cc
index 593dca65f76..e1226bf266e 100644
--- a/gdbserver/tracepoint.cc
+++ b/gdbserver/tracepoint.cc
@@ -249,7 +249,7 @@ tracepoint_look_up_symbols (void)
 
       if (look_up_one_symbol (symbol_list[i].name, addrp, 1) == 0)
 	{
-	  threads_debug_printf ("symbol `%s' not found", symbol_list[i].name);
+	  threads_debug_printf ("symbol \"%s\" not found", symbol_list[i].name);
 	  return;
 	}
     }
@@ -5170,23 +5170,23 @@ fast_tracepoint_collecting (CORE_ADDR thread_area,
   if (read_inferior_data_pointer (ipa_sym_addrs.addr_gdb_jump_pad_buffer,
 				  &ipa_gdb_jump_pad_buffer))
     {
-      internal_error ("error extracting `gdb_jump_pad_buffer'");
+      internal_error ("error extracting \"gdb_jump_pad_buffer\"");
     }
   if (read_inferior_data_pointer (ipa_sym_addrs.addr_gdb_jump_pad_buffer_end,
 				  &ipa_gdb_jump_pad_buffer_end))
     {
-      internal_error ("error extracting `gdb_jump_pad_buffer_end'");
+      internal_error ("error extracting \"gdb_jump_pad_buffer_end\"");
     }
 
   if (read_inferior_data_pointer (ipa_sym_addrs.addr_gdb_trampoline_buffer,
 				  &ipa_gdb_trampoline_buffer))
     {
-      internal_error ("error extracting `gdb_trampoline_buffer'");
+      internal_error ("error extracting \"gdb_trampoline_buffer\"");
     }
   if (read_inferior_data_pointer (ipa_sym_addrs.addr_gdb_trampoline_buffer_end,
 				  &ipa_gdb_trampoline_buffer_end))
     {
-      internal_error ("error extracting `gdb_trampoline_buffer_end'");
+      internal_error ("error extracting \"gdb_trampoline_buffer_end\"");
     }
 
   if (ipa_gdb_jump_pad_buffer <= stop_pc
@@ -5768,7 +5768,7 @@ download_tracepoint (struct tracepoint *tpoint)
 				      + offsetof (struct tracepoint, next),
 				      &tp_prev_target_next_addr))
 	{
-	  internal_error ("error reading `tp_prev->next'");
+	  internal_error ("error reading \"tp_prev->next\"");
 	}
 
       /* tpoint->next = tp_prev->next */