diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6b1563a111..ec0ed5f1b2 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2020-09-12  Joel Brobecker  <brobecker@adacore.com>
+
+	* infrun.c (namespace selftests): Only define #if GDB_SELF_TEST.
+
 2020-09-11  Moritz Riesterer  <moritz.riesterer@intel.com>
 	    Felix Willgerodt  <Felix.Willgerodt@intel.com>
 
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 82ec30086a..5773fd0395 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -9200,6 +9200,7 @@ infrun_async_inferior_event_handler (gdb_client_data data)
   inferior_event_handler (INF_REG_EVENT);
 }
 
+#if GDB_SELF_TEST
 namespace selftests
 {
 
@@ -9264,6 +9265,8 @@ infrun_thread_ptid_changed ()
 
 } /* namespace selftests */
 
+#endif /* GDB_SELF_TEST */
+
 void _initialize_infrun ();
 void
 _initialize_infrun ()