diff --git a/mbed_lstools/lstools_base.py b/mbed_lstools/lstools_base.py
index b1c723d..72264f3 100644
--- a/mbed_lstools/lstools_base.py
+++ b/mbed_lstools/lstools_base.py
@@ -24,6 +24,7 @@
 from os.path import isfile, join
 from lockfile import LockFailed, LockTimeout
 
+
 class MbedLsToolsBase:
     """ Base class for mbed-lstools, defines mbed-ls tools interface for mbed-enabled devices detection for various hosts
     """
@@ -37,6 +38,7 @@ def __init__(self):
 
         # Create in HOME directory place for mbed-ls to store information
         self.mbedls_home_dir_init()
+        self.mbedls_get_mocks()
 
     # Which OSs are supported by this module
     # Note: more than one OS can be supported by mbed-lstools_* module
diff --git a/mbed_lstools/main.py b/mbed_lstools/main.py
index ea15370..1ece44d 100644
--- a/mbed_lstools/main.py
+++ b/mbed_lstools/main.py
@@ -170,9 +170,6 @@ def get_mbedls_version():
     mbeds.debug(__name__, "mbed-ls ver. " + get_mbedls_version())
     mbeds.debug(__name__, "host: " +  str((mbed_lstools_os_info())))
 
-    # Load extra mock configuration
-    mbeds.mbedls_get_mocks()
-
     if not opts.skip_retarget:
         mbeds.retarget()