diff --git a/swh/web/ui/tests/test_app.py b/swh/web/ui/tests/test_app.py
index f2d6ff3d..56af9858 100644
--- a/swh/web/ui/tests/test_app.py
+++ b/swh/web/ui/tests/test_app.py
@@ -1,59 +1,58 @@
 # Copyright (C) 2015  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 # Functions defined here are NOT DESIGNED FOR PRODUCTION
 
 
-from swh.web.ui import controller
 from swh.storage.api.client import RemoteStorage as Storage
 from swh.web.ui import renderers, main
 
 
 # Because the Storage's __init__ function does side effect at startup...
 class RemoteStorageAdapter(Storage):
     def __init__(self, base_url):
         self.base_url = base_url
 
 
 def _init_mock_storage(base_url='https://somewhere.org:4321'):
     """Instanciate a remote storage whose goal is to be mocked in a test
     context.
 
     NOT FOR PRODUCTION
 
     Returns:
         An instance of swh.storage.api.client.RemoteStorage destined to be
         mocked (it does not do any rest call)
 
     """
     return RemoteStorageAdapter(base_url)  # destined to be used as mock
 
 
 def init_app(base_url='https://somewhere.org:4321'):
     """Function to initiate a flask app with storage designed to be mocked.
 
     Returns:
         Tuple app and storage.
 
     NOT FOR PRODUCTION
 
     """
     storage = _init_mock_storage(base_url)
 
     # inject the mock data
     conf = {'storage': storage,
             'upload_folder': '/some/upload-dir',
             'upload_allowed_extensions': ['txt'],
             'max_upload_size': 1024}
 
-    controller.app.config['TESTING'] = True
-    controller.app.config.update({'conf': conf})
-    controller.app.config['MAX_CONTENT_LENGTH'] = conf['max_upload_size']
-    controller.app.config['DEFAULT_RENDERERS'] = renderers.RENDERERS
+    main.app.config['TESTING'] = True
+    main.app.config.update({'conf': conf})
+    main.app.config['MAX_CONTENT_LENGTH'] = conf['max_upload_size']
+    main.app.config['DEFAULT_RENDERERS'] = renderers.RENDERERS
     main.load_controllers()
 
-    app = controller.app.test_client()
+    app = main.app.test_client()
 
-    return app, controller.app.config, storage
+    return app, main.app.config, storage