diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 44aa9a3b94..2ca2493c0e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2019-03-12  Pedro Alves  <palves@redhat.com>
+
+	* yy-remap.h [TEST_CPNAMES] (YYFPRINTF): Don't define.
+
 2019-03-12  Pedro Alves  <palves@redhat.com>
 
 	* cp-name-parser.y (main): Remove unused 'len' variable.
diff --git a/gdb/yy-remap.h b/gdb/yy-remap.h
index 579b7d2aee..cdd0aae8c6 100644
--- a/gdb/yy-remap.h
+++ b/gdb/yy-remap.h
@@ -92,6 +92,8 @@
 # define YYDEBUG 1  /* Default to yydebug support */
 #endif
 
-#define YYFPRINTF parser_fprintf
+#ifndef TEST_CPNAMES
+# define YYFPRINTF parser_fprintf
+#endif
 
 #endif /* YY_REMAP_H */