diff --git a/spyder/api/plugins.py b/spyder/api/plugins.py
index <HASH>..<HASH> 100644
--- a/spyder/api/plugins.py
+++ b/spyder/api/plugins.py
@@ -574,7 +574,6 @@ class Plugins:
     """
     Application = 'application'
     Breakpoints = 'breakpoints'
-    CodeAnalysis = 'code_analysis'
     CodeCompletion = 'code_completion'
     KiteCompletion = 'kite'
     FallBackCompletion = 'fallback'
diff --git a/spyder/app/solver.py b/spyder/app/solver.py
index <HASH>..<HASH> 100644
--- a/spyder/app/solver.py
+++ b/spyder/app/solver.py
@@ -166,6 +166,9 @@ def solve_plugin_dependencies(plugins):
         plugin._OPTIONAL = plugin.OPTIONAL.copy()
 
     plugin_names = {plugin.NAME: plugin for plugin in plugins}
+    # TODO: Remove the next line once the migration is finished (it
+    # shouldn't be necessary)
+    plugin_names.update(find_internal_plugins())
     dependencies_dict = {}
 
     # Prune plugins based on required dependencies
Add (temporarily) internal plugins to the list used to solve deps