diff --git a/test/data/update_netconf_config_schema.py b/test/data/update_netconf_config_schema.py
index 0e4b4e99616e94932e496175fefa4193e4a72633..3a6cd094d0c5d900ec899a7c58419c585832e37e 100644
--- a/test/data/update_netconf_config_schema.py
+++ b/test/data/update_netconf_config_schema.py
@@ -23,5 +23,5 @@ if __name__ == "__main__":
 
     OUTPUT_DIRNAME = os.path.dirname(__file__)
     schema_doc = load_config_schema(hostname, params['ssh'])
-    with open(os.path.join(OUTPUT_DIRNAME, 'netconf-config-schema.xml'), 'w') as f:
+    with open(os.path.join(OUTPUT_DIRNAME, 'juniper-netconf.xsd'), 'w') as f:
         f.write(etree.tostring(schema_doc, pretty_print=True).decode('utf-8'))
\ No newline at end of file
diff --git a/test/test_netconf_data.py b/test/test_netconf_data.py
index 88d3613f05b6fa9775978096d066ec272f3146f3..6a20a272480fe5a502862597ea72cc9bafea50ff 100644
--- a/test/test_netconf_data.py
+++ b/test/test_netconf_data.py
@@ -23,14 +23,13 @@ class MockedJunosDevice(object):
         pass
 
 
-def test_nr1(mocker, data_config):
+def test_query_doc_and_validate(mocker, data_config):
     mocker.patch(
-        'inventory_provider.pyez_test.Device',
-        # 'inventory_provider.pyez_test.jnpr.junos.Device',
+        'inventory_provider.netconf.Device',
         MockedJunosDevice)
 
-    import json
+    etree.parse(SCHEMA_FILENAME)
     for r in data_config['routers']:
-        print(r['hostname'])
-        x = netconf.load_interfaces(r['hostname'], data_config['ssh'])
-        print(json.dumps(list(x), indent=4))
+        doc = netconf.load_config(r['hostname'], data_config['ssh'])
+
+
diff --git a/test/test_netconf_parsing.py b/test/test_netconf_parsing.py
index 88d3613f05b6fa9775978096d066ec272f3146f3..804d550b16a94cf191e06e93d09d9b2d6e1d6128 100644
--- a/test/test_netconf_parsing.py
+++ b/test/test_netconf_parsing.py
@@ -25,8 +25,7 @@ class MockedJunosDevice(object):
 
 def test_nr1(mocker, data_config):
     mocker.patch(
-        'inventory_provider.pyez_test.Device',
-        # 'inventory_provider.pyez_test.jnpr.junos.Device',
+        'inventory_provider.netconf.Device',
         MockedJunosDevice)
 
     import json