diff --git a/test/monitor.c b/test/monitor.c
index eb11eb81..35379415 100644
--- a/test/monitor.c
+++ b/test/monitor.c
@@ -505,7 +505,7 @@ become_monitor (Fixture *f,
   int i;
   dbus_uint32_t zero = 0;
 
-  dbus_connection_set_route_peer_messages (f->monitor, TRUE);
+  dbus_connection_set_builtin_filters_enabled (f->monitor, FALSE);
 
   if (config == NULL)
     config = f->config;
diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c
index fcc923ee..cd5d9ae8 100644
--- a/tools/dbus-monitor.c
+++ b/tools/dbus-monitor.c
@@ -494,7 +494,7 @@ main (int argc, char *argv[])
   /* Receive o.fd.Peer messages as normal messages, rather than having
    * libdbus handle them internally, which is the wrong thing for
    * a monitor */
-  dbus_connection_set_route_peer_messages (connection, TRUE);
+  dbus_connection_set_builtin_filters_enabled (connection, FALSE);
 
   if (!dbus_connection_add_filter (connection, filter_func,
                                    _DBUS_INT_TO_POINTER (binary_mode), NULL))