diff --git a/test/system/007-cmdmon b/test/system/007-cmdmon
index 16b6ea3..c0e108e 100755
--- a/test/system/007-cmdmon
+++ b/test/system/007-cmdmon
@@ -64,7 +64,7 @@ check_chronyc_output "^Name/IP address             Mode KeyID Type KLen Last Atm
 run_chronyc "clients" || test_fail
 check_chronyc_output "^Hostname                      NTP   Drop Int IntL Last     Cmd   Drop Int  Last
 ===============================================================================
-127\.0\.0\.1                       [1-9]      0   -   -     [0-9]       0      0   -     -$" \
+127\.0\.0\.1                       [0-9 ]+    0 [-0-9 ]+   -     [0-9]       0      0   -     -$" \
 	|| test_fail
 
 run_chronyc "ntpdata $server" || test_fail
@@ -75,7 +75,7 @@ Leap status     : Normal
 Version         : 4
 Mode            : Server
 Stratum         : 10
-Poll interval   : -6 \(0 seconds\)
+Poll interval   : (-6|[0345]) \([0-9]+ seconds\)
 Precision       : [0-9 +-]+ \(0\.[0-9]+ seconds\)
 Root delay      : 0\.000000 seconds
 Root dispersion : 0\.000000 seconds