diff --git a/csit/suites/netconf/CRUD-ACTION/CRUD-ACTION.robot b/csit/suites/netconf/CRUD-ACTION/CRUD-ACTION.robot
index 3a76977c49..b878485d40 100644
--- a/csit/suites/netconf/CRUD-ACTION/CRUD-ACTION.robot
+++ b/csit/suites/netconf/CRUD-ACTION/CRUD-ACTION.robot
@@ -67,7 +67,8 @@ Wait_For_Device_To_Become_Connected
 
 Check_Device_Data_Is_Empty
     [Documentation]    Get the device data and make sure it is empty.
-    Check_Config_Data    <data xmlns\="${ODL_NETCONF_NAMESPACE}"/>
+    ${escaped} =    BuiltIn.Regexp_Escape    ${ODL_NETCONF_NAMESPACE}
+    Check_Config_Data    <data xmlns\="${escaped}"(\/>|><\/data>)    ${True}
 
 Invoke_Yang1.1_Action_Via_Xml_Post
     [Documentation]    Send a sample test data label into the device and check that the request went OK.
@@ -148,9 +149,12 @@ Get_Config_Data
     RETURN    ${data}
 
 Check_Config_Data
-    [Arguments]    ${expected}    ${contains}=False
+    [Arguments]    ${expected}    ${regex}=False    ${contains}=False
     ${data} =    Get_Config_Data
-    IF    not ${contains}
+    IF    ${regex}
+        BuiltIn.Should Match Regexp    ${data}    ${expected}
+    ELSE IF    ${contains}
+        BuiltIn.Should_Contain    ${data}    ${expected}
+    ELSE
         BuiltIn.Should_Be_Equal_As_Strings    ${data}    ${expected}
     END
-    IF    ${contains}    BuiltIn.Should_Contain    ${data}    ${expected}
diff --git a/csit/suites/netconf/CRUD/CRUD-RPC.robot b/csit/suites/netconf/CRUD/CRUD-RPC.robot
index b6a80668d3..9a90e4502d 100644
--- a/csit/suites/netconf/CRUD/CRUD-RPC.robot
+++ b/csit/suites/netconf/CRUD/CRUD-RPC.robot
@@ -80,7 +80,8 @@ Wait_For_Device_To_Become_Connected
 
 Check_Device_Data_Is_Empty
     [Documentation]    Get the device data and make sure it is empty.
-    Check_Config_Data    <data xmlns\="${ODL_NETCONF_NAMESPACE}"/>
+    ${escaped}=    BuiltIn.Regexp_Escape    ${ODL_NETCONF_NAMESPACE}
+    Check_Config_Data    <data xmlns\="${escaped}"(\/>|><\/data>)    ${True}
 
 Create_Device_Data_Label_Via_Xml
     [Documentation]    Send a sample test data label into the device and check that the request went OK.
@@ -229,7 +230,8 @@ Delete_Device_Data
 
 Check_Device_Data_Is_Deleted
     [Documentation]    Get the device data and make sure it is empty again.
-    Check_Config_Data    <data xmlns\="${ODL_NETCONF_NAMESPACE}"/>
+    ${escaped}=    BuiltIn.Regexp_Escape    ${ODL_NETCONF_NAMESPACE}
+    Check_Config_Data    <data xmlns\="${escaped}"(\/>|><\/data>)    ${True}
 
 Deconfigure_Device_From_Netconf
     [Documentation]    Make request to deconfigure the testtool device on Netconf connector.
@@ -279,9 +281,12 @@ Get_Config_Data
     RETURN    ${data}
 
 Check_Config_Data
-    [Arguments]    ${expected}    ${contains}=False
+    [Arguments]    ${expected}    ${regex}=False    ${contains}=False
     ${data}=    Get_Config_Data
-    IF    not ${contains}
+    IF    ${regex}
+        BuiltIn.Should Match Regexp    ${data}    ${expected}
+    ELSE IF    ${contains}
+        BuiltIn.Should_Contain    ${data}    ${expected}
+    ELSE
         BuiltIn.Should_Be_Equal_As_Strings    ${data}    ${expected}
     END
-    IF    ${contains}    BuiltIn.Should_Contain    ${data}    ${expected}
diff --git a/csit/suites/netconf/CRUD/CRUD.robot b/csit/suites/netconf/CRUD/CRUD.robot
index d01bc69aab..f634d2236a 100644
--- a/csit/suites/netconf/CRUD/CRUD.robot
+++ b/csit/suites/netconf/CRUD/CRUD.robot
@@ -71,7 +71,8 @@ Wait_For_Device_To_Become_Connected
 
 Check_Device_Data_Is_Empty
     [Documentation]    Get the device data and make sure it is empty.
-    Check_Config_Data    <data xmlns\="${ODL_NETCONF_NAMESPACE}"/>
+    ${escaped}=    BuiltIn.Regexp_Escape    ${ODL_NETCONF_NAMESPACE}
+    Check_Config_Data    <data xmlns\="${escaped}"(\/>|><\/data>)    ${True}
 
 Create_Device_Data_Label_Via_Xml
     [Documentation]    Send a sample test data label into the device and check that the request went OK.
@@ -212,7 +213,8 @@ Delete_Device_Data
 
 Check_Device_Data_Is_Deleted
     [Documentation]    Get the device data and make sure it is empty again.
-    Check_Config_Data    <data xmlns\="${ODL_NETCONF_NAMESPACE}"/>
+    ${escaped}=    BuiltIn.Regexp_Escape    ${ODL_NETCONF_NAMESPACE}
+    Check_Config_Data    <data xmlns\="${escaped}"(\/>|><\/data>)    ${True}
 
 Deconfigure_Device_From_Netconf
     [Documentation]    Make request to deconfigure the testtool device on Netconf connector.
@@ -259,12 +261,15 @@ Get_Config_Data
     RETURN    ${data}
 
 Check_Config_Data
-    [Arguments]    ${expected}    ${contains}=False
+    [Arguments]    ${expected}    ${regex}=False    ${contains}=False
     ${data}=    Get_Config_Data
-    IF    not ${contains}
+    IF    ${regex}
+        BuiltIn.Should Match Regexp    ${data}    ${expected}
+    ELSE IF    ${contains}
+        BuiltIn.Should_Contain    ${data}    ${expected}
+    ELSE
         BuiltIn.Should_Be_Equal_As_Strings    ${data}    ${expected}
     END
-    IF    ${contains}    BuiltIn.Should_Contain    ${data}    ${expected}
 
 Count_Netconf_Connectors
     ${count}=    NetconfKeywords.Count_Netconf_Connectors_For_Device    ${device_name}