diff --git a/lib/galaxy/tool_shed/galaxy_install/tools/tool_panel_manager.py b/lib/galaxy/tool_shed/galaxy_install/tools/tool_panel_manager.py
index 8f4aceaeaac..9588f35dbc7 100644
--- a/lib/galaxy/tool_shed/galaxy_install/tools/tool_panel_manager.py
+++ b/lib/galaxy/tool_shed/galaxy_install/tools/tool_panel_manager.py
@@ -180,10 +180,12 @@ class ToolPanelManager:
                         paths=list(new_path_guids),
                         rebuild_whoosh=True,
                         path_guids=new_path_guids,
+                        app=self.app,
                     )
-                    # Refresh THIS process synchronously; the AMQP broadcast
-                    # above only reaches peers asynchronously, but the install
-                    # response should reflect the new tools immediately.
+                    # Refresh THIS process synchronously; the control-task
+                    # broadcast above only reaches peers asynchronously, but
+                    # the install response should reflect the new tools
+                    # immediately.
                     self.app.toolbox.invalidate_index_cache()
                 # Wire the new tools into the in-memory panel; ``create_tool``
                 # finds them in the index and hands back ``LazyTool`` stubs.
diff --git a/lib/galaxy/tools/lazy_toolbox.py b/lib/galaxy/tools/lazy_toolbox.py
index 760c4dd633e..943f524cf40 100644
--- a/lib/galaxy/tools/lazy_toolbox.py
+++ b/lib/galaxy/tools/lazy_toolbox.py
@@ -909,6 +909,7 @@ class LazyToolBox(ToolBox):
                 self.app.config,
                 [path],
                 path_guids={path: guid},
+                app=self.app,
             )
         except Exception as e:
             log.warning("Ad-hoc populate for %s raised: %s", path, e)
diff --git a/lib/galaxy_test/driver/uses_shed.py b/lib/galaxy_test/driver/uses_shed.py
index b061bdbb03c..fa40c97022b 100644
--- a/lib/galaxy_test/driver/uses_shed.py
+++ b/lib/galaxy_test/driver/uses_shed.py
@@ -91,7 +91,7 @@ class UsesShed(UsesShedApi):
         # would otherwise survive the ``reload_toolbox`` below: ``LazyToolBox``
         # only re-runs the populator when discovery turns up a *new* path.
         try:
-            reconcile_index(self._app.config, rebuild_whoosh=True)
+            reconcile_index(self._app.config, rebuild_whoosh=True, app=self._app)
         except Exception as e:
             log.warning("reset_shed_tools: reconcile_index raised (continuing): %s", e)
         # deleting the containing folder doesn't trigger a toolbox reload, so signal it now and wait until it's done