diff --git a/test/test_snmp_get.sh b/test/test_snmp_get.sh
index a2356a6a..9066d6fd 100755
--- a/test/test_snmp_get.sh
+++ b/test/test_snmp_get.sh
@@ -34,6 +34,7 @@ cat <<EOF > $cfg
   <CLICON_XMLDB_DIR>$dir</CLICON_XMLDB_DIR>
   <CLICON_SNMP_AGENT_SOCK>unix:$SOCK</CLICON_SNMP_AGENT_SOCK>
   <CLICON_SNMP_MIB>CLIXON-TYPES-MIB</CLICON_SNMP_MIB>
+  <CLICON_VALIDATE_STATE_XML>true</CLICON_VALIDATE_STATE_XML>
 </clixon-config>
 EOF
 
@@ -69,7 +70,7 @@ cat <<EOF > $fstate
   </clixonExampleScalars>
   <clixonIETFWGTable>
     <clixonIETFWGEntry>
-      <nsIETFWGName>index</nsIETFWGName>
+      <nsIETFWGName>1</nsIETFWGName>
       <nsIETFWGChair1>Name1</nsIETFWGChair1>
       <nsIETFWGChair2>Name2</nsIETFWGChair2>
     </clixonIETFWGEntry>
diff --git a/test/test_snmp_ifmib.sh b/test/test_snmp_ifmib.sh
index 745dd167..0207f5b7 100755
--- a/test/test_snmp_ifmib.sh
+++ b/test/test_snmp_ifmib.sh
@@ -40,6 +40,7 @@ cat <<EOF > $cfg
   <CLICON_XMLDB_DIR>$dir</CLICON_XMLDB_DIR>
   <CLICON_SNMP_AGENT_SOCK>unix:$SOCK</CLICON_SNMP_AGENT_SOCK>
   <CLICON_SNMP_MIB>IF-MIB</CLICON_SNMP_MIB>
+  <CLICON_VALIDATE_STATE_XML>true</CLICON_VALIDATE_STATE_XML>
 </clixon-config>
 EOF
 
@@ -89,7 +90,7 @@ cat <<EOF > $fstate
       <ifOutDiscards>130</ifOutDiscards>
       <ifOutErrors>131</ifOutErrors>
       <ifOutQLen>132</ifOutQLen>
-      <ifSpecific>SNMPv2-SMI::zeroDotZero</ifSpecific>
+      <ifSpecific>0.0</ifSpecific>
     </ifEntry>
     <ifEntry>
       <ifIndex>2</ifIndex>
@@ -113,7 +114,7 @@ cat <<EOF > $fstate
       <ifOutDiscards>101010</ifOutDiscards>
       <ifOutErrors>111111</ifOutErrors>
       <ifOutQLen>111</ifOutQLen>
-      <ifSpecific>SNMPv2-SMI::zeroDotZero</ifSpecific>
+      <ifSpecific>1.2.3</ifSpecific>
     </ifEntry>
   </ifTable>
 </IF-MIB>
@@ -324,7 +325,7 @@ validate_oid $NAME21.2 $NAME21.2 "Gauge32" 111
 new "Test $OID22 ifSpecific"
 validate_oid $OID22 $OID22 "OID" ".0.0"
 validate_oid $NAME22.1 $NAME22.1 "OID" "SNMPv2-SMI::zeroDotZero"
-validate_oid $NAME22.2 $NAME22.2 "OID" "SNMPv2-SMI::zeroDotZero"
+validate_oid $NAME22.2 $NAME22.2 "OID" "iso.2.3"
 
 new "Test ifTable"
 expectpart "$($snmptable IF-MIB::ifTable)" 0 "Test 2" "1400" "1000" "11:22:33:44:55:66" "down" "111" "222" "333" "444" "555" "666" "777" "888" "999" "101010" "111111" "111"
@@ -373,7 +374,7 @@ expectpart "$($snmpwalk IF-MIB::ifTable)" 0 "IF-MIB::ifIndex.1 = INTEGER: 1" \
            "IF-MIB::ifOutQLen.1 = Gauge32: 132" \
            "IF-MIB::ifOutQLen.2 = Gauge32: 111" \
            "IF-MIB::ifSpecific.1 = OID: SNMPv2-SMI::zeroDotZero" \
-           "IF-MIB::ifSpecific.2 = OID: SNMPv2-SMI::zeroDotZero"
+           "IF-MIB::ifSpecific.2 = OID: iso.2.3"
 testexit
 
 new "endtest"
diff --git a/test/test_snmp_set.sh b/test/test_snmp_set.sh
index 9a22fba8..bf77d746 100755
--- a/test/test_snmp_set.sh
+++ b/test/test_snmp_set.sh
@@ -35,6 +35,7 @@ cat <<EOF > $cfg
   <CLICON_XMLDB_DIR>$dir</CLICON_XMLDB_DIR>
   <CLICON_SNMP_AGENT_SOCK>unix:$SOCK</CLICON_SNMP_AGENT_SOCK>
   <CLICON_SNMP_MIB>CLIXON-TYPES-MIB</CLICON_SNMP_MIB>
+  <CLICON_VALIDATE_STATE_XML>true</CLICON_VALIDATE_STATE_XML>
 </clixon-config>
 EOF
 
diff --git a/test/test_snmp_system.sh b/test/test_snmp_system.sh
index ed06a9a9..c6a02fbe 100755
--- a/test/test_snmp_system.sh
+++ b/test/test_snmp_system.sh
@@ -15,7 +15,7 @@ fi
 snmpd=$(type -p snmpd)
 snmpget="$(type -p snmpget) -On -c public -v2c localhost "
 snmpwalk="$(type -p snmpwalk) -On -c public -v2c localhost "
-snmpwalkstr="$(type -p snmpwalk) s-c public -v2c localhost "
+snmpwalkstr="$(type -p snmpwalk) -c public -v2c localhost "
 snmpgetnext="$(type -p snmpgetnext) -On -c public -v2c localhost "
 snmptable="$(type -p snmptable) -c public -v2c localhost "
 
@@ -41,6 +41,7 @@ cat <<EOF > $cfg
   <CLICON_XMLDB_DIR>$dir</CLICON_XMLDB_DIR>
   <CLICON_SNMP_AGENT_SOCK>unix:$SOCK</CLICON_SNMP_AGENT_SOCK>
   <CLICON_SNMP_MIB>SNMPv2-MIB</CLICON_SNMP_MIB>
+  <CLICON_VALIDATE_STATE_XML>true</CLICON_VALIDATE_STATE_XML>
 </clixon-config>
 EOF
 
@@ -71,13 +72,13 @@ cat <<EOF > $fstate
     <sysORTable>
         <sysOREntry>
             <sysORIndex>1</sysORIndex>
-            <sysORID>IP-MIB::ip</sysORID>
+            <sysORID>1.3.6.1.2.1.4</sysORID>
             <sysORDescr>Entry 1 description</sysORDescr>
             <sysORUpTime>11223344</sysORUpTime>
         </sysOREntry>
         <sysOREntry>
             <sysORIndex>2</sysORIndex>
-            <sysORID>IF-MIB:ifTable</sysORID>
+            <sysORID>1.3.6.1.2.1.2.2</sysORID>
             <sysORDescr>Entry 2 description</sysORDescr>
             <sysORUpTime>1122111111</sysORUpTime>
         </sysOREntry>
diff --git a/test/test_snmp_table.sh b/test/test_snmp_table.sh
index ac5d4fbc..14b912dc 100755
--- a/test/test_snmp_table.sh
+++ b/test/test_snmp_table.sh
@@ -44,6 +44,7 @@ cat <<EOF > $cfg
   <CLICON_XMLDB_DIR>$dir</CLICON_XMLDB_DIR>
   <CLICON_SNMP_AGENT_SOCK>unix:$SOCK</CLICON_SNMP_AGENT_SOCK>
   <CLICON_SNMP_MIB>NET-SNMP-EXAMPLES-MIB</CLICON_SNMP_MIB>
+  <CLICON_VALIDATE_STATE_XML>true</CLICON_VALIDATE_STATE_XML>
 </clixon-config>
 EOF