diff --git a/bin/yunohost b/bin/yunohost
index 3e6f031b..798b0f6b 100755
--- a/bin/yunohost
+++ b/bin/yunohost
@@ -5,10 +5,6 @@ import os
 import sys
 import argparse
 
-import moulinette
-from moulinette.actionsmap import ActionsMap
-from moulinette.interfaces.cli import colorize, get_locale
-
 # Either we are in a development environment or not
 IN_DEVEL = False
 
@@ -35,6 +31,11 @@ if IN_DEVEL:
     LOG_DIR = os.path.join(basedir, 'log')
 
 
+import moulinette
+from moulinette.actionsmap import ActionsMap
+from moulinette.interfaces.cli import colorize, get_locale
+
+
 # Initialization & helpers functions -----------------------------------
 
 def _die(message, title='Error:'):
diff --git a/bin/yunohost-api b/bin/yunohost-api
index f1370205..d2b219f8 100755
--- a/bin/yunohost-api
+++ b/bin/yunohost-api
@@ -5,10 +5,6 @@ import os
 import sys
 import argparse
 
-import moulinette
-from moulinette.actionsmap import ActionsMap
-from moulinette.interfaces.cli import colorize
-
 # Either we are in a development environment or not
 IN_DEVEL = False
 
@@ -39,6 +35,11 @@ if IN_DEVEL:
     LOG_DIR = os.path.join(basedir, 'log')
 
 
+import moulinette
+from moulinette.actionsmap import ActionsMap
+from moulinette.interfaces.cli import colorize
+
+
 # Initialization & helpers functions -----------------------------------
 
 def _die(message, title='Error:'):