diff --git a/test/test_choice.sh b/test/test_choice.sh
index a0b0008b..97adda0c 100755
--- a/test/test_choice.sh
+++ b/test/test_choice.sh
@@ -12,8 +12,12 @@ s="$_" ; . ./lib.sh || if [ "$s" = $0 ]; then exit 0; else return 0; fi
 APPNAME=example
 
 cfg=$dir/choice.xml
+clidir=$dir/cli
 fyang=$dir/type.yang
 
+test -d ${clidir} || rm -rf ${clidir}
+mkdir $clidir
+
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config none false)
 
@@ -27,6 +31,7 @@ cat <<EOF > $cfg
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
   <CLICON_CLI_MODE>$APPNAME</CLICON_CLI_MODE>
+  <CLICON_CLISPEC_DIR>$clidir</CLICON_CLISPEC_DIR>
   <CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
   <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
   <CLICON_XMLDB_DIR>/usr/local/var/$APPNAME</CLICON_XMLDB_DIR>
@@ -105,6 +110,30 @@ module system{
 }
 EOF
 
+cat <<EOF > $clidir/ex.cli
+# Clixon example specification
+CLICON_MODE="example";
+CLICON_PROMPT="%U@%H %W> ";
+CLICON_PLUGIN="example_cli";
+
+# Autocli syntax tree operations
+set @datamodel, cli_auto_set();
+delete("Delete a configuration item") {
+      @datamodel, cli_auto_del(); 
+      all("Delete whole candidate configuration"), delete_all("candidate");
+}
+validate("Validate changes"), cli_validate();
+commit("Commit the changes"), cli_commit();
+quit("Quit"), cli_quit();
+discard("Discard edits (rollback 0)"), discard_changes();
+
+show("Show a particular state of the system"){
+    configuration("Show configuration"), cli_auto_show("datamodel", "candidate", "text", true, false);{
+	    cli("Show configuration as CLI commands"), cli_auto_show("datamodel", "candidate", "cli", true, false, "set ");
+    }
+}
+EOF
+
 new "test params: -f $cfg"
 
 if [ $BE -ne 0 ]; then
diff --git a/test/test_cli.sh b/test/test_cli.sh
index 3e55b3a1..6366a0e7 100755
--- a/test/test_cli.sh
+++ b/test/test_cli.sh
@@ -16,11 +16,9 @@ APPNAME=example
 
 cfg=$dir/conf_yang.xml
 clidir=$dir/cli
-if [ -d $clidir ]; then
-    rm -rf $clidir/*
-else
-    mkdir $clidir
-fi
+
+test -d ${clidir} || rm -rf ${clidir}
+mkdir $clidir
 
 # Use yang in example