diff --git a/test/mem.sh b/test/mem.sh
index 503d60f7..0798998b 100755
--- a/test/mem.sh
+++ b/test/mem.sh
@@ -28,8 +28,6 @@ memonce(){
 	'backend')
 	    valgrindtest=2 # This means backend valgrind test
 	    : ${RCWAIT:=10} # valgrind backend needs some time to get up 
-	    perfnr=100 # test_perf.sh restconf put more or less stops
-	    perfreq=10
 
 	    clixon_backend="/usr/bin/valgrind --num-callers=50 --leak-check=full --show-leak-kinds=all --suppressions=./valgrind-clixon.supp --track-fds=yes --trace-children=yes --log-file=$valgrindfile clixon_backend"
 	    ;;
diff --git a/test/test_api_path.sh b/test/test_api_path.sh
index 408374e0..6a38b45a 100755
--- a/test/test_api_path.sh
+++ b/test/test_api_path.sh
@@ -12,6 +12,11 @@ s="$_" ; . ./lib.sh || if [ "$s" = $0 ]; then exit 0; else return 0; fi
 
 : ${clixon_util_path:=clixon_util_path -a -D $DBG}
 
+if [ $nr -lt 2 ] ; then
+    echo "nr==$nr must be > 1"
+    exit
+fi
+
 # Number of list/leaf-list entries
 : ${nr:=100}
 
diff --git a/test/test_perf_mem.sh b/test/test_perf_mem.sh
index c7028f07..941ee377 100755
--- a/test/test_perf_mem.sh
+++ b/test/test_perf_mem.sh
@@ -14,7 +14,7 @@ s="$_" ; . ./lib.sh || if [ "$s" = $0 ]; then exit 0; else return 0; fi
 clixon_util_xpath=clixon_util_xpath 
 
 # Number of list/leaf-list entries in file
-: ${perfnr:=10000}
+: ${perfnr:=1000} # 10000 causes timeout in valgrind test
 
 APPNAME=example
 
diff --git a/test/test_stream.sh b/test/test_stream.sh
index 79f4d218..098b2ffe 100755
--- a/test/test_stream.sh
+++ b/test/test_stream.sh
@@ -310,3 +310,4 @@ rm -rf $dir
 
 # unset conditional parameters 
 unset clixon_util_stream
+unset nr
diff --git a/test/test_transaction.sh b/test/test_transaction.sh
index 13e4c597..8da5157b 100755
--- a/test/test_transaction.sh
+++ b/test/test_transaction.sh
@@ -321,3 +321,4 @@ stop_backend -f $cfg
 
 rm -rf $dir
 
+unset nr
diff --git a/test/test_transaction_restart.sh b/test/test_transaction_restart.sh
index b71f1a5e..2bba4752 100755
--- a/test/test_transaction_restart.sh
+++ b/test/test_transaction_restart.sh
@@ -147,3 +147,4 @@ stop_backend -f $cfg
 
 rm -rf $dir
 
+unset nr