diff --git a/src/components/core/CoreManager.cpp b/src/components/core/CoreManager.cpp
index 1774c3584..9f1994f02 100644
--- a/src/components/core/CoreManager.cpp
+++ b/src/components/core/CoreManager.cpp
@@ -63,6 +63,8 @@ CoreManager::CoreManager (QObject *parent, const QString &configPath) :
     mInstance->mSettingsModel = new SettingsModel(mInstance);
     mInstance->mAccountSettingsModel = new AccountSettingsModel(mInstance);
 
+    mInstance->mStarted = true;
+
     emit mInstance->coreStarted();
   });
 
diff --git a/src/components/core/CoreManager.hpp b/src/components/core/CoreManager.hpp
index 2de5786eb..b8474b9b4 100644
--- a/src/components/core/CoreManager.hpp
+++ b/src/components/core/CoreManager.hpp
@@ -47,6 +47,10 @@ class CoreManager : public QObject {
 public:
   ~CoreManager () = default;
 
+  bool started () const {
+    return mStarted;
+  }
+
   std::shared_ptr<linphone::Core> getCore () {
     Q_CHECK_PTR(mCore);
     return mCore;
@@ -151,6 +155,8 @@ private:
   std::shared_ptr<linphone::Core> mCore;
   std::shared_ptr<CoreHandlers> mHandlers;
 
+  bool mStarted = false;
+
   CallsListModel *mCallsListModel = nullptr;
   ContactsListModel *mContactsListModel = nullptr;
   SipAddressesModel *mSipAddressesModel = nullptr;
diff --git a/src/tests/main-view/MainViewTest.cpp b/src/tests/main-view/MainViewTest.cpp
index 6c0088da3..3afba733d 100644
--- a/src/tests/main-view/MainViewTest.cpp
+++ b/src/tests/main-view/MainViewTest.cpp
@@ -42,7 +42,7 @@ void MainViewTest::showManageAccountsPopup () {
 
   QVERIFY(virtualWindowContent);
   QVERIFY(!strncmp(virtualWindowContent->metaObject()->className(), name, sizeof name - 1));
-  QCOMPARE(virtualWindowContent->objectName(), QStringLiteral("manageAccounts"));
+  QCOMPARE(virtualWindowContent->objectName(), QStringLiteral("__manageAccounts"));
 
   // Close popup.
   QTest::mouseClick(mainWindow, Qt::LeftButton, Qt::KeyboardModifiers(), QPoint(476, 392));
diff --git a/src/tests/self-test/SelfTest.cpp b/src/tests/self-test/SelfTest.cpp
index 4c0a02647..006988adc 100644
--- a/src/tests/self-test/SelfTest.cpp
+++ b/src/tests/self-test/SelfTest.cpp
@@ -20,6 +20,7 @@
  *      Author: Ronan Abhamon
  */
 
+#include <QQmlProperty>
 #include <QSignalSpy>
 #include <QTest>
 
@@ -32,12 +33,16 @@
 // =============================================================================
 
 void SelfTest::checkAppStartup () {
-  QSignalSpy spyCoreStarted(CoreManager::getInstance()->getHandlers().get(), &CoreHandlers::coreStarted);
-  QSignalSpy spyLoaderReady(TestUtils::getMainLoaderFromMainWindow(), SIGNAL(loaded()));
+  CoreManager *coreManager = CoreManager::getInstance();
+  QQuickItem *mainLoader = TestUtils::getMainLoaderFromMainWindow();
 
-  QVERIFY(spyCoreStarted.wait(5000));
+  QSignalSpy spyCoreStarted(coreManager->getHandlers().get(), &CoreHandlers::coreStarted);
+  QSignalSpy spyLoaderReady(mainLoader, SIGNAL(loaded()));
 
-  if (spyLoaderReady.count() != 1)
+  if (!coreManager->started())
+    QVERIFY(spyCoreStarted.wait(5000));
+
+  if (!QQmlProperty::read(mainLoader, "item").value<QObject *>())
     QVERIFY(spyLoaderReady.wait(1000));
 
   QVERIFY(QTest::qWaitForWindowExposed(App::getInstance()->getMainWindow()));
diff --git a/ui/modules/Common/Popup/DesktopPopup.qml b/ui/modules/Common/Popup/DesktopPopup.qml
index 7f7374fce..d641d0002 100644
--- a/ui/modules/Common/Popup/DesktopPopup.qml
+++ b/ui/modules/Common/Popup/DesktopPopup.qml
@@ -48,7 +48,7 @@ Item {
     id: window
 
     // Used for internal purposes only. Like Notifications.
-    objectName: 'internalWindow'
+    objectName: '__internalWindow'
 
     flags: wrapper.flags
     opacity: 0
diff --git a/ui/modules/Linphone/Notifications/Notification.spec.qml b/ui/modules/Linphone/Notifications/Notification.spec.qml
index ffbd5b540..4a74fa077 100644
--- a/ui/modules/Linphone/Notifications/Notification.spec.qml
+++ b/ui/modules/Linphone/Notifications/Notification.spec.qml
@@ -39,6 +39,6 @@ TestCase {
     var window = notification.data[0]
 
     compare(Utils.qmlTypeof(window, 'QQuickWindowQmlImpl'), true)
-    compare(window.objectName === 'internalWindow', true)
+    compare(window.objectName === '__internalWindow', true)
   }
 }
diff --git a/ui/views/App/Main/Dialogs/ManageAccounts.qml b/ui/views/App/Main/Dialogs/ManageAccounts.qml
index 83e2ddcaa..f20adba52 100644
--- a/ui/views/App/Main/Dialogs/ManageAccounts.qml
+++ b/ui/views/App/Main/Dialogs/ManageAccounts.qml
@@ -18,7 +18,7 @@ DialogPlus {
   ]
 
   centeredButtons: true
-  objectName: 'manageAccounts'
+  objectName: '__manageAccounts'
 
   height: ManageAccountsStyle.height
   width: ManageAccountsStyle.width