diff --git a/packages/orchestration/test/facade.test.ts b/packages/orchestration/test/facade.test.ts
index 8c2514d052e..0057a932502 100644
--- a/packages/orchestration/test/facade.test.ts
+++ b/packages/orchestration/test/facade.test.ts
@@ -19,18 +19,15 @@ export const mockChainInfo: CosmosChainInfo = harden({
 });
 
 test('chain info', async t => {
-  const { bootstrap } = await commonSetup(t);
+  const { bootstrap, facadeServices } = await commonSetup(t);
 
   const zone = bootstrap.rootZone;
 
   const { zcf } = await setupZCFTest();
 
   const { registerChain, orchestrate } = makeOrchestrationFacade({
-    agoricNames: bootstrap.agoricNames,
-    localchain: bootstrap.localchain,
-    orchestrationService: bootstrap.orchestration,
+    ...facadeServices,
     storageNode: bootstrap.storage.rootNode,
-    timerService: bootstrap.timer,
     zcf,
     zone,
   });
@@ -46,7 +43,7 @@ test('chain info', async t => {
 });
 
 test('contract upgrade', async t => {
-  const { bootstrap } = await commonSetup(t);
+  const { bootstrap, facadeServices } = await commonSetup(t);
 
   const zone = bootstrap.rootZone;
 
@@ -55,11 +52,8 @@ test('contract upgrade', async t => {
   // Register once
   {
     const { registerChain } = makeOrchestrationFacade({
-      agoricNames: bootstrap.agoricNames,
-      localchain: bootstrap.localchain,
-      orchestrationService: bootstrap.orchestration,
+      ...facadeServices,
       storageNode: bootstrap.storage.rootNode,
-      timerService: bootstrap.timer,
       zcf,
       zone,
     });
@@ -74,11 +68,8 @@ test('contract upgrade', async t => {
   // Simulate running again in a new incarnation with the same zone
   {
     const { registerChain } = makeOrchestrationFacade({
-      agoricNames: bootstrap.agoricNames,
-      localchain: bootstrap.localchain,
-      orchestrationService: bootstrap.orchestration,
+      ...facadeServices,
       storageNode: bootstrap.storage.rootNode,
-      timerService: bootstrap.timer,
       zcf,
       zone,
     });
diff --git a/packages/orchestration/test/supports.ts b/packages/orchestration/test/supports.ts
index fea78fb9123..b87f4678bb7 100644
--- a/packages/orchestration/test/supports.ts
+++ b/packages/orchestration/test/supports.ts
@@ -93,6 +93,12 @@ export const commonSetup = async t => {
       storageNode: storage.rootNode,
       timerService: timer,
     },
+    facadeServices: {
+      agoricNames,
+      localchain,
+      orchestrationService: orchestration,
+      timerService: timer,
+    },
     utils: {
       pourPayment,
     },