diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42a48f04..92480bc2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,9 +31,10 @@
 
 The 5.0.0 release is a new major release. The last major release was
 4.0.0 in 13 July 2019.  Recently, large changes to RESTCONF
-configuration has been made which is the primary reason for a new
-major version. Other changes include NETCONF call home and a new
-client API, and a changed lock behavior.
+configuration has been made which is the primary reason for a new major version.
+
+Other changes since 4.9 include NETCONF call home and a new
+client API, and a modified lock behavior.
 
 Thanks Netgate and clixon community input for making this possible!
 
diff --git a/test/config.sh.in b/test/config.sh.in
index d470715c..8e538b4c 100755
--- a/test/config.sh.in
+++ b/test/config.sh.in
@@ -58,3 +58,6 @@ WWWDIR=@wwwdir@
 
 # Top src dir
 TOP_SRCDIR=@top_srcdir@
+
+# Clixon version
+CLIXON_VERSION=@CLIXON_VERSION@
diff --git a/test/lib.sh b/test/lib.sh
index 1e249468..1029156d 100755
--- a/test/lib.sh
+++ b/test/lib.sh
@@ -27,9 +27,6 @@
 # in either the environment or the site.sh, then the default SKIPLIST is empty.
 : ${SKIPLIST:=""}
 
-# Some tests (openconfig/yang_models) just test for the cli to return a version
-version=4
-
 >&2 echo "Running $testfile"
 
 # Generated config file from autotools / configure
@@ -40,7 +37,6 @@ if [ -f ./config.sh ]; then
     fi
 fi
 
-
 # Test number from start
 : ${testnr:=0}
 
diff --git a/test/test_openconfig.sh b/test/test_openconfig.sh
index 77234937..6db95ab5 100755
--- a/test/test_openconfig.sh
+++ b/test/test_openconfig.sh
@@ -100,9 +100,8 @@ new "Openconfig test: $clixon_cli -1f $cfg -y $f show version ($m modules)"
 for f in $files; do
     if [ -n "$(head -1 $f|grep '^module')" ]; then
 	new "$clixon_cli -D $DBG  -1f $cfg -y $f show version"
-	expectpart "$($clixon_cli -D $DBG -1f $cfg -y $f show version)" 0 "$version."
+	expectpart "$($clixon_cli -D $DBG -1f $cfg -y $f show version)" 0 "${CLIXON_VERSION}"
     fi
-
 done
 
 rm -rf $dir
diff --git a/test/test_sock.sh b/test/test_sock.sh
index 95f42ba1..db3a9854 100755
--- a/test/test_sock.sh
+++ b/test/test_sock.sh
@@ -61,7 +61,7 @@ EOF
     fi
 
     new "$clixon_cli -1f $cfg show version"
-    expectpart "$($clixon_cli -1f $cfg show version)" 0 "$version."
+    expectpart "$($clixon_cli -1f $cfg show version)" 0 "${CLIXON_VERSION}"
  
     new "hello session-id 2"
     expecteof "$clixon_util_socket -a $family -s $sock -D $DBG" 0 "<hello $DEFAULTNS/>" "<hello $DEFAULTNS><session-id>3</session-id></hello>"
diff --git a/test/test_yang.sh b/test/test_yang.sh
index 14f23f34..46c23654 100755
--- a/test/test_yang.sh
+++ b/test/test_yang.sh
@@ -157,7 +157,7 @@ if [ "$BE" -ne 0 ]; then
 fi
 
 new "cli defined extension"
-expectpart "$($clixon_cli -1f $cfg show version)" 0 "$version."
+expectpart "$($clixon_cli -1f $cfg show version)" 0 "${CLIXON_VERSION}"
 
 new "empty values in leaf-list"
 expecteof "$clixon_netconf -qf $cfg" 0 "<rpc $DEFAULTNS><edit-config><target><candidate/></target><config><x xmlns=\"urn:example:clixon\"><f><e>a</e></f></x></config></edit-config></rpc>]]>]]>" "^<rpc-reply $DEFAULTNS><ok/></rpc-reply>]]>]]>$"
diff --git a/test/test_yang_models_ieee.sh b/test/test_yang_models_ieee.sh
index d9ca4a33..71a06059 100755
--- a/test/test_yang_models_ieee.sh
+++ b/test/test_yang_models_ieee.sh
@@ -43,35 +43,34 @@ EOF
 
 new "yangmodels parse: -f $cfg"
 
-
 new "yangmodel Experimental IEEE 802.1: $YANGMODELS/experimental/ieee/802.1"
-expectpart "$($clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/experimental/ieee/802.1 -p $YANGMODELS/experimental/ieee/1588 show version)" 0 "$version."
+expectpart "$($clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/experimental/ieee/802.1 -p $YANGMODELS/experimental/ieee/1588 show version)" 0 "${CLIXON_VERSION}"
 
 new "yangmodel Experimental IEEE 1588: $YANGMODELS/experimental/ieee/1588"
-expectpart "$($clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/experimental/ieee/1588 show version)" 0 "$version."
+expectpart "$($clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/experimental/ieee/1588 show version)" 0 "${CLIXON_VERSION}"
 
 # Standard IEEE
 new "yangmodel Standard IEEE 802.1: $YANGMODELS/standard/ieee/draft/802.1/ABcu"
-expectpart "$($clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/standard/ieee/draft/802.1/ABcu show version)" 0 "$version."
+expectpart "$($clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/standard/ieee/draft/802.1/ABcu show version)" 0 "${CLIXON_VERSION}"
 
 new "yangmodel Standard IEEE 802.1: $YANGMODELS/standard/ieee/draft/802.1/Qcr"
-expectpart "$($clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/standard/ieee/draft/802.1/Qcr show version)" 0 "$version."
+expectpart "$($clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/standard/ieee/draft/802.1/Qcr show version)" 0 "${CLIXON_VERSION}"
 
 new "yangmodel Standard IEEE 802.1: $YANGMODELS/standard/ieee/draft/802.1/Qcw"
-expectpart "$($clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/standard/ieee/draft/802.1/Qcw show version)" 0 "$version."
+expectpart "$($clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/standard/ieee/draft/802.1/Qcw show version)" 0 "${CLIXON_VERSION}"
 
 new "yangmodel Standard IEEE 802.1: $YANGMODELS/standard/ieee/draft/802.1/Qcx"
-expectpart "$($clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/standard/ieee/draft/802.1/Qcx -p $YANGMODELS/standard/ieee/draft/802.1/ABcu show version)" 0 "$version."
+expectpart "$($clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/standard/ieee/draft/802.1/Qcx -p $YANGMODELS/standard/ieee/draft/802.1/ABcu show version)" 0 "${CLIXON_VERSION}"
 
 new "yangmodel Standard IEEE 802.1: $YANGMODELS/standard/ieee/draft/802.1/x"
-expectpart "$($clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/standard/ieee/draft/802.1/x show version)" 0 "$version."
+expectpart "$($clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/standard/ieee/draft/802.1/x show version)" 0 "${CLIXON_VERSION}"
 
 # Published
 new "yangmodel Standard IEEE 802.1: $YANGMODELS/standard/ieee/published/802.1"
-expectpart "$($clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/standard/ieee/published/802.1 show version)" 0 "$version."
+expectpart "$($clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/standard/ieee/published/802.1 show version)" 0 "${CLIXON_VERSION}"
 
 new "yangmodel Standard IEEE 802.1: $YANGMODELS/standard/ieee/published/802.3"
-expectpart "$($clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/standard/ieee/published/802.3 show version)" 0 "$version."
+expectpart "$($clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/standard/ieee/published/802.3 show version)" 0 "${CLIXON_VERSION}"
 
 rm -rf $dir
 
diff --git a/test/test_yang_models_ietf.sh b/test/test_yang_models_ietf.sh
index 4b493336..f9734633 100755
--- a/test/test_yang_models_ietf.sh
+++ b/test/test_yang_models_ietf.sh
@@ -43,6 +43,6 @@ EOF
 # Standard IETF
 new "yangmodel Standard IETF: $YANGMODELS/standard/ietf/RFC"
 echo "$clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/standard/ietf/RFC show version"
-expectpart "$($clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/standard/ietf/RFC show version)" 0 "$version."
+expectpart "$($clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/standard/ietf/RFC show version)" 0 "${CLIXON_VERSION}"
 
 rm -rf $dir