diff --git a/daemon/main.c b/daemon/main.c
index 662766e00..8d198cfde 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -1228,7 +1228,7 @@ static void options(int *argc, char ***argv, charp_ht templates) {
 					count, rtpe_config.mysql_query);
 	}
 
-	enum endpoint_learning el_config = EL_DELAYED;
+	enum endpoint_learning el_config = EL_HEURISTIC;
 	if (endpoint_learning) {
 		if (!strcasecmp(endpoint_learning, "delayed"))
 			el_config = EL_DELAYED;
diff --git a/t/auto-daemon-tests-asymmetric.pl b/t/auto-daemon-tests-asymmetric.pl
index a5f15c4315..8b0937af5 100755
--- a/t/auto-daemon-tests-asymmetric.pl
+++ b/t/auto-daemon-tests-asymmetric.pl
@@ -9,7 +9,7 @@ use Test::More;
 
 
 autotest_start(qw(--config-file=none -t -1 -i 203.0.113.1
-			-n 2223 -f -L 7 -E))
+			-n 2223 -f -L 7 -E --endpoint-learning=delayed))
 		or die;
 
 
diff --git a/t/auto-daemon-tests.pl b/t/auto-daemon-tests.pl
index 6dcc43163..d3cf0ed39 100755
--- a/t/auto-daemon-tests.pl
+++ b/t/auto-daemon-tests.pl
@@ -12,7 +12,8 @@ use POSIX;
 
 
 autotest_start(qw(--config-file=none -t -1 -i 203.0.113.1 -i 2001:db8:4321::1
-			-n 2223 -c 12345 -f -L 7 -E -u 2222 --silence-detect=1 --log-level-internals=7))
+			-n 2223 -c 12345 -f -L 7 -E -u 2222 --silence-detect=1 --log-level-internals=7
+			--endpoint-learning=delayed))
 		or die;