diff --git a/inventory_provider/config.py b/inventory_provider/config.py
index 101f60e3688b37bdbee0eeeb1d2f55844bd736dc..5dd0019a9ac2770e785be3e6b8d2671ba3d7d579 100644
--- a/inventory_provider/config.py
+++ b/inventory_provider/config.py
@@ -31,6 +31,7 @@ CONFIG_SCHEMA = {
         "ssh": {
             "type": "object",
             "properties": {
+                "username": {"type": "string"},
                 "private-key": {"type": "string"},
                 "known-hosts": {"type": "string"}
             },
diff --git a/inventory_provider/juniper.py b/inventory_provider/juniper.py
index d801c8d329f781a1e5ee792c4b429f749eb65d4c..b63adf50d0a93167deb0d17f39a899033c5aaf86 100644
--- a/inventory_provider/juniper.py
+++ b/inventory_provider/juniper.py
@@ -60,7 +60,7 @@ def ssh_connection(hostname, ssh_params):
         ssh.load_host_keys(known_hosts)
         ssh.connect(
             hostname=hostname,
-            username="Monit0r",
+            username=ssh_params['username'],
             pkey=k)
         yield ssh
 
diff --git a/inventory_provider/pyez_test.py b/inventory_provider/pyez_test.py
index e62495e5109f0b6ceba985000c2dc55a69764207..008134136f673709883f065953e801a6c3941634 100644
--- a/inventory_provider/pyez_test.py
+++ b/inventory_provider/pyez_test.py
@@ -9,7 +9,7 @@ def load_config(hostname, ssh_params):
 
     dev = Device(
         host=hostname,
-        user="Monit0r",
+        user=ssh_params['username'],
         ssh_private_key_file=ssh_params['private-key'])
     dev.open()
     # data = dev.rpc.get_config(options={'format': 'json'})
diff --git a/test/conftest.py b/test/conftest.py
index 2789c343f05653828c9491cdddca547c0652e619..1a9764c389936b47d619020c8547f83933ac74da 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -88,6 +88,7 @@ def data_config_filename(tmp_dir_name):
             tmp_dir_name,
             "routers_community.conf"),
         "ssh": {
+            "username": "uSeR-NaMe",
             "private-key": "private-key-filename",
             "known-hosts": "known-hosts=filename"
         },
diff --git a/test/data/update_netconf_data.py b/test/data/update_netconf_data.py
index 1975f94d27f0a11228e9b3ec221ccb8fda7496a3..e6c766ee58d8fb252cc7357e79ae68101235c6d8 100644
--- a/test/data/update_netconf_data.py
+++ b/test/data/update_netconf_data.py
@@ -10,7 +10,7 @@ def _load_netconf(hostname, ssh_params):
 
     dev = Device(
         host=hostname,
-        user="Monit0r",
+        user=ssh_params['username'],
         ssh_private_key_file=ssh_params['private-key'])
     dev.open()
     print(dev.facts)
diff --git a/test/data/update_test_data.py b/test/data/update_test_data.py
index d8ee14cd5b9a88ed849fe033af1f72d36f6751cf..393877a7af32a6967532d0a126390bf56fb36be3 100644
--- a/test/data/update_test_data.py
+++ b/test/data/update_test_data.py
@@ -18,8 +18,9 @@ SSH_DIR = os.path.join(
     "ssh")
 
 SSH_PARAMS = {
-    "private-key": os.path.join(SSH_DIR, "monitor_dsa"),
-    "known-hosts": os.path.join(SSH_DIR, "monitor_known_hosts")
+    'username': 'Monit0r',
+    'private-key': os.path.join(SSH_DIR, 'monitor_dsa'),
+    'known-hosts': os.path.join(SSH_DIR, 'monitor_known_hosts')
 }
 
 SHELL_COMMANDS = []