diff --git a/testing/tests/ikev2/ip-pool-db/evaltest.dat b/testing/tests/ikev2/ip-pool-db/evaltest.dat
index cdc4895c1..07d17b338 100644
--- a/testing/tests/ikev2/ip-pool-db/evaltest.dat
+++ b/testing/tests/ikev2/ip-pool-db/evaltest.dat
@@ -12,8 +12,8 @@ moon::cat /var/log/daemon.log::peer requested virtual IP %any::YES
 moon::cat /var/log/daemon.log::assigning lease with new address from pool.*bigpool::YES
 moon::cat /var/log/daemon.log::assigning virtual IP::YES
 moon::ipsec pool --status::bigpool.*10.3.0.1.*10.3.255.254.*static.*2::YES
-moon::ipsec pool --leases::bigpool.*10.3.0.1.*carol@strongswan.org.*online::YES
-moon::ipsec pool --leases::bigpool.*10.3.0.2.*dave@strongswan.org.*online::YES
+moon::ipsec pool --leases --filter pool=bigpool,addr=10.3.0.1,id=carol@strongswan.org::online::YES
+moon::ipsec pool --leases --filter pool=bigpool,addr=10.3.0.2,id=dave@strongswan.org::online::YES
 moon::ipsec status::rw.*ESTABLISHED.*carol@strongswan.org::YES
 moon::ipsec status::rw.*ESTABLISHED.*dave@strongswan.org::YES
 moon::tcpdump::IP carol.strongswan.org > moon.strongswan.org: ESP::YES
diff --git a/testing/tests/sql/ip-pool-db-expired/evaltest.dat b/testing/tests/sql/ip-pool-db-expired/evaltest.dat
index aa7291c7a..5d9d9441a 100644
--- a/testing/tests/sql/ip-pool-db-expired/evaltest.dat
+++ b/testing/tests/sql/ip-pool-db-expired/evaltest.dat
@@ -12,8 +12,8 @@ moon::cat /var/log/daemon.log::peer requested virtual IP %any::YES
 moon::cat /var/log/daemon.log::reassigning address from expired lease from pool.*bigpool::YES
 moon::cat /var/log/daemon.log::assigning virtual IP::YES
 moon::ipsec pool --status::bigpool.*10.3.0.1.*10.3.255.254.*1h.*2::YES
-moon::ipsec pool --leases::bigpool.*10.3.0.1.*carol@strongswan.org.*online::YES
-moon::ipsec pool --leases::bigpool.*10.3.0.2.*dave@strongswan.org.*online::YES
+moon::ipsec pool --leases --filter pool=bigpool,addr=10.3.0.1,id=carol@strongswan.org::online::YES
+moon::ipsec pool --leases --filter pool=bigpool,addr=10.3.0.2,id=dave@strongswan.org::online::YES
 moon::ipsec status::rw.*ESTABLISHED.*carol@strongswan.org::YES
 moon::ipsec status::rw.*ESTABLISHED.*dave@strongswan.org::YES
 moon::tcpdump::IP carol.strongswan.org > moon.strongswan.org: ESP::YES
diff --git a/testing/tests/sql/ip-pool-db-restart/evaltest.dat b/testing/tests/sql/ip-pool-db-restart/evaltest.dat
index 83914322c..5db30da40 100644
--- a/testing/tests/sql/ip-pool-db-restart/evaltest.dat
+++ b/testing/tests/sql/ip-pool-db-restart/evaltest.dat
@@ -12,8 +12,8 @@ moon::cat /var/log/daemon.log::peer requested virtual IP %any::YES
 moon::cat /var/log/daemon.log::reassigning address from valid lease from pool.*bigpool::YES
 moon::cat /var/log/daemon.log::assigning virtual IP::YES
 moon::ipsec pool --status::bigpool.*10.3.0.1.*10.3.255.254.*static.*2::YES
-moon::ipsec pool --leases::bigpool.*10.3.0.1.*carol@strongswan.org.*online::YES
-moon::ipsec pool --leases::bigpool.*10.3.0.2.*dave@strongswan.org.*online::YES
+moon::ipsec pool --leases --filter pool=bigpool,addr=10.3.0.1,id=carol@strongswan.org::online::YES
+moon::ipsec pool --leases --filter pool=bigpool,addr=10.3.0.2,id=dave@strongswan.org::online::YES
 moon::ipsec status::rw.*ESTABLISHED.*carol@strongswan.org::YES
 moon::ipsec status::rw.*ESTABLISHED.*dave@strongswan.org::YES
 moon::tcpdump::IP carol.strongswan.org > moon.strongswan.org: ESP::YES
diff --git a/testing/tests/sql/ip-pool-db/evaltest.dat b/testing/tests/sql/ip-pool-db/evaltest.dat
index cdc4895c1..07d17b338 100644
--- a/testing/tests/sql/ip-pool-db/evaltest.dat
+++ b/testing/tests/sql/ip-pool-db/evaltest.dat
@@ -12,8 +12,8 @@ moon::cat /var/log/daemon.log::peer requested virtual IP %any::YES
 moon::cat /var/log/daemon.log::assigning lease with new address from pool.*bigpool::YES
 moon::cat /var/log/daemon.log::assigning virtual IP::YES
 moon::ipsec pool --status::bigpool.*10.3.0.1.*10.3.255.254.*static.*2::YES
-moon::ipsec pool --leases::bigpool.*10.3.0.1.*carol@strongswan.org.*online::YES
-moon::ipsec pool --leases::bigpool.*10.3.0.2.*dave@strongswan.org.*online::YES
+moon::ipsec pool --leases --filter pool=bigpool,addr=10.3.0.1,id=carol@strongswan.org::online::YES
+moon::ipsec pool --leases --filter pool=bigpool,addr=10.3.0.2,id=dave@strongswan.org::online::YES
 moon::ipsec status::rw.*ESTABLISHED.*carol@strongswan.org::YES
 moon::ipsec status::rw.*ESTABLISHED.*dave@strongswan.org::YES
 moon::tcpdump::IP carol.strongswan.org > moon.strongswan.org: ESP::YES