diff --git a/src/slurmctld/agent.c b/src/slurmctld/agent.c
index 04c093832f74826a3e54b02146e6fe5e7e253239..1d2ec4c447844c61078359ddccad18afb011219a 100644
--- a/src/slurmctld/agent.c
+++ b/src/slurmctld/agent.c
@@ -312,7 +312,8 @@ wdog (void *args)
 		xfree (slurm_addr);
 #endif
 	}
-	debug ("agent maximum delay %d seconds", max_delay);
+	if (max_delay)
+		debug ("agent maximum delay %d seconds", max_delay);
 
 	pthread_mutex_unlock (&agent_ptr->thread_mutex);
 	return (void *) NULL;
diff --git a/src/slurmctld/node_scheduler.c b/src/slurmctld/node_scheduler.c
index 0342d9bdb55d8b8ff5814f7b3482ae24524dd161..6deecdefc55a4d0e0d546e1eebd79149e8387508 100644
--- a/src/slurmctld/node_scheduler.c
+++ b/src/slurmctld/node_scheduler.c
@@ -42,7 +42,7 @@
 #include <src/slurmctld/agent.h>
 #include <src/slurmctld/slurmctld.h>
 
-#define AGENT_TEST 0
+#define AGENT_TEST 1
 #define BUF_SIZE 1024
 
 struct node_set {		/* set of nodes with same configuration */