diff --git a/bin/named/client.c b/bin/named/client.c
index 15be58681e..15b139b5df 100644
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -566,8 +566,7 @@ client_request(isc_task_t *task, isc_event_t *event) {
 		break;
 	case dns_opcode_notify:
 		CTRACE("notify");
-		xfrin_test(); /* XXX for testing only */
-		ns_client_next(client, DNS_R_SUCCESS);
+		ns_client_error(client, DNS_R_NOTIMP);
 		break;
 	case dns_opcode_iquery:
 		CTRACE("iquery");
diff --git a/bin/named/server.c b/bin/named/server.c
index 7dd194f018..9ac5147c38 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -283,7 +283,6 @@ load_configuration(void) {
 	}
 
 	ns_interfacemgr_scan(ns_g_interfacemgr);
-	xfrin_test();
 }
 
 static void