diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 00cd6fabf53..423fd3794f4 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -30,7 +30,6 @@
 #include "androidmanager.h"
 #include "androidqtversion.h"
 #include "androiddevicedialog.h"
-#include "androidsdkmanager.h"
 #include "avddialog.h"
 
 #include <coreplugin/icore.h>
@@ -964,11 +963,10 @@ QStringList AndroidConfig::allEssentials() const
     return allPackages;
 }
 
-bool AndroidConfig::allEssentialsInstalled()
+bool AndroidConfig::allEssentialsInstalled(AndroidSdkManager *sdkManager)
 {
     QStringList essentialPkgs(allEssentials());
-    for (const AndroidSdkPackage *pkg :
-         AndroidConfigurations::sdkManager()->installedSdkPackages()) {
+    for (const AndroidSdkPackage *pkg : sdkManager->installedSdkPackages()) {
         if (essentialPkgs.contains(pkg->sdkStylePath()))
             essentialPkgs.removeOne(pkg->sdkStylePath());
         if (essentialPkgs.isEmpty())
diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h
index 24e26309a04..a727b3690ce 100644
--- a/src/plugins/android/androidconfigurations.h
+++ b/src/plugins/android/androidconfigurations.h
@@ -27,6 +27,8 @@
 
 #include "android_global.h"
 #include "androidsdkpackage.h"
+#include "androidsdkmanager.h"
+
 #include <projectexplorer/toolchain.h>
 #include <qtsupport/qtversionmanager.h>
 
@@ -134,7 +136,7 @@ public:
     QStringList defaultEssentials() const;
     QStringList essentialsFromQtVersion(const QtSupport::BaseQtVersion &version) const;
     QStringList allEssentials() const;
-    bool allEssentialsInstalled();
+    bool allEssentialsInstalled(Internal::AndroidSdkManager *sdkManager);
     bool sdkToolsOk() const;
 
     Utils::FilePath openJDKLocation() const;
diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp
index af7e9492482..efa32e1b1f2 100644
--- a/src/plugins/android/androidsettingswidget.cpp
+++ b/src/plugins/android/androidsettingswidget.cpp
@@ -606,7 +606,8 @@ void AndroidSettingsWidget::validateSdk()
     // after AndroidSdkManager::packageReloadFinished.
     m_androidSummary->setPointValid(PlatformSdkInstalledRow,
                                     !m_sdkManager.installedSdkPlatforms().isEmpty());
-    m_androidSummary->setPointValid(AllEssentialsInstalledRow, m_androidConfig.allEssentialsInstalled());
+    m_androidSummary->setPointValid(AllEssentialsInstalledRow,
+                                    m_androidConfig.allEssentialsInstalled(&m_sdkManager));
 
     const bool sdkToolsOk = m_androidSummary->rowsOk({SdkPathExistsRow,
                                                       SdkPathWritableRow,