diff --git a/test/test_perf_netconf.sh b/test/test_perf_netconf.sh
index cd7d2849..7beb12b9 100755
--- a/test/test_perf_netconf.sh
+++ b/test/test_perf_netconf.sh
@@ -151,7 +151,7 @@ new "netconf get $perfreq small config 1 key index"
rnd=$(( ( RANDOM % $perfnr ) ))
rpc=$(chunked_framing "")
echo "$rpc"
-done | $clixon_netconf -Hqef $cfg > /dev/null; } 2>&1 | awk '/real/ {print $2}'
+done | $clixon_netconf -qe1f $cfg > /dev/null; } 2>&1 | awk '/real/ {print $2}'
new "netconf get $perfreq small config 1 key index start/stop"
{ time -p for (( i=0; i<$perfreq; i++ )); do
@@ -167,7 +167,7 @@ new "netconf get $perfreq small config 1 key + 1 non-key index"
rnd=$(( ( RANDOM % $perfnr ) ))
rpc=$(chunked_framing "")
echo "$rpc"
-done | $clixon_netconf -Hqef $cfg > /dev/null; } 2>&1 | awk '/real/ {print $2}'
+done | $clixon_netconf -qe1f $cfg > /dev/null; } 2>&1 | awk '/real/ {print $2}'
# NETCONF add
new "netconf add $perfreq small config"
@@ -175,7 +175,7 @@ new "netconf add $perfreq small config"
rnd=$(( ( RANDOM % $perfnr ) ))
rpc=$(chunked_framing "$rnd$rnd")
echo "$rpc"
-done | $clixon_netconf -Hqef $cfg > /dev/null; } 2>&1 | awk '/real/ {print $2}'
+done | $clixon_netconf -qe1f $cfg > /dev/null; } 2>&1 | awk '/real/ {print $2}'
# Instead of many small entries, get one large in netconf and restconf
# cli?
@@ -191,7 +191,7 @@ new "netconf delete $perfreq small config"
rnd=$(( ( RANDOM % $perfnr ) ))
rpc=$(chunked_framing "$rnd")
echo "$rpc"
-done | $clixon_netconf -Hqef $cfg > /dev/null; } 2>&1 | awk '/real/ {print $2}'
+done | $clixon_netconf -qe1f $cfg > /dev/null; } 2>&1 | awk '/real/ {print $2}'
#new "netconf discard-changes"
expecteof_netconf "$clixon_netconf -qef $cfg" 0 "$DEFAULTHELLO" "" "" ""
@@ -218,7 +218,7 @@ new "netconf add $perfreq small leaf-list config"
rnd=$(( ( RANDOM % $perfnr ) ))
rpc=$(chunked_framing "$rnd")
echo "$rpc"
-done | $clixon_netconf -Hqef $cfg > /dev/null; } 2>&1 | awk '/real/ {print $2}'
+done | $clixon_netconf -qe1f $cfg > /dev/null; } 2>&1 | awk '/real/ {print $2}'
new "netconf add small leaf-list config"
expecteof_netconf "time -p $clixon_netconf -qef $cfg" 0 "$DEFAULTHELLO" "x" "" "" 2>&1 | awk '/real/ {print $2}'
diff --git a/test/test_perf_restconf_ssl.sh b/test/test_perf_restconf_ssl.sh
index fb49e0f4..91ce054e 100755
--- a/test/test_perf_restconf_ssl.sh
+++ b/test/test_perf_restconf_ssl.sh
@@ -229,7 +229,7 @@ new "netconf add $perfreq small leaf-list config"
{ time -p for (( i=0; i<$perfreq; i++ )); do
rnd=$(( ( RANDOM % $perfnr ) ))
rpc=$(chunked_framing "$rnd")
-done | $clixon_netconf -Hqf $cfg > /dev/null; } 2>&1 | awk '/real/ {print $2}'
+done | $clixon_netconf -qe1f $cfg > /dev/null; } 2>&1 | awk '/real/ {print $2}'
new "netconf add small leaf-list config"
expecteof_netconf "time -p $clixon_netconf -qef $cfg" 0 "$DEFAULTHELLO" "x" "" "" 2>&1 | awk '/real/ {print $2}'
diff --git a/test/test_perf_state.sh b/test/test_perf_state.sh
index 6ef8fc23..d9d3b459 100755
--- a/test/test_perf_state.sh
+++ b/test/test_perf_state.sh
@@ -158,7 +158,7 @@ new "netconf get $perfreq single reqs"
sel="/ex:interfaces/ex:a[ex:name='foo']/ex:b/ex:interface[ex:name='e$rnd']"
rpc=$(chunked_framing "")
echo "$rpc"
-done | $clixon_netconf -Hqef $cfg > /dev/null; } 2>&1 | awk '/real/ {print $2}'
+done | $clixon_netconf -qe1f $cfg > /dev/null; } 2>&1 | awk '/real/ {print $2}'
# RESTCONF get
new "restconf get test single req"
diff --git a/test/test_perf_state_only.sh b/test/test_perf_state_only.sh
index 9165f844..2145bf0a 100755
--- a/test/test_perf_state_only.sh
+++ b/test/test_perf_state_only.sh
@@ -142,7 +142,7 @@ new "netconf get $perfreq single reqs"
sel="/ex:interfaces/ex:a[ex:name='foo']/ex:b/ex:interface[ex:name='e$rnd']"
rpc=$(chunked_framing "")
echo "$rpc"
-done | $clixon_netconf -Hqef $cfg > /dev/null; } 2>&1 | awk '/real/ {print $2}'
+done | $clixon_netconf -1qf $cfg > /dev/null; } 2>&1 | awk '/real/ {print $2}'
# RESTCONF get
#echo "curl $CURLOPTS -X GET $RCPROTO://localhost/restconf/data/example:interfaces/a=foo/b/interface=e1"