diff --git a/.github/workflows/test-all-packages.yml b/.github/workflows/test-all-packages.yml
index 3725573dc7a..ab79771ce14 100644
--- a/.github/workflows/test-all-packages.yml
+++ b/.github/workflows/test-all-packages.yml
@@ -567,7 +567,9 @@ jobs:
 
       - uses: actions/checkout@v3
       - name: docker build (sdk)
-        run: cd packages/deployment && ./scripts/test-docker-build.sh | $TEST_COLLECT
+        # run: cd packages/deployment && ./scripts/test-docker-build.sh | $TEST_COLLECT
+        # XXX skip TAP test output and collection for now; it hides the output from the logs
+        run: cd packages/deployment && make docker-build-sdk
       - name: docker build upgrade test
         run: cd packages/deployment/upgrade-test && docker build --build-arg BOOTSTRAP_MODE=${{ matrix.bootstrap-version }} --build-arg DEST_IMAGE=ghcr.io/agoric/agoric-sdk:latest -t docker-upgrade-test:latest -f Dockerfile upgrade-test-scripts
       - name: docker run upgrade final stage
diff --git a/packages/deployment/upgrade-test/Dockerfile b/packages/deployment/upgrade-test/Dockerfile
index 6ef48d22f29..3189e38f622 100644
--- a/packages/deployment/upgrade-test/Dockerfile
+++ b/packages/deployment/upgrade-test/Dockerfile
@@ -1,147 +1,18 @@
 # Defaults
+ARG BASE_IMAGE=ghcr.io/agoric/agoric-3-proposals:main
 ARG DEST_IMAGE=ghcr.io/agoric/agoric-sdk:dev
 ARG BOOTSTRAP_MODE=main
 
 # TODO different naming scheme for upgrade handler (in app.go) and the image name
 
-###
-# Kinds of layers:
-# START             ag0, start of the chain
-# UPGRADE+TEST      legacy layer type in which the chain upgrade and its tests are comingled
-# UPGRADE           layer that only runs the upgrade handler
-# TEST              layer that only tests a previous upgrade
-# DEST              the final layer this build is producing, opening an interactive shell
-
-## START
-# on agoric-uprade-7-2, with upgrade to agoric-upgrade-8
-FROM ghcr.io/agoric/ag0:agoric-upgrade-7-2 as agoric-upgrade-7-2
-ARG BOOTSTRAP_MODE
-ARG UPGRADE_INFO_8
-ENV UPGRADE_TO=agoric-upgrade-8 UPGRADE_INFO=${UPGRADE_INFO_8} THIS_NAME=agoric-upgrade-7-2 BOOTSTRAP_MODE=${BOOTSTRAP_MODE}
-RUN echo "${BOOTSTRAP_MODE}"
-RUN mkdir -p /usr/src/agoric-sdk/upgrade-test-scripts
-WORKDIR /usr/src/agoric-sdk/
-COPY ./start_ag0.sh ./upgrade-test-scripts/
-COPY ./env_setup.sh ./start_to_to.sh ./upgrade-test-scripts/
-SHELL ["/bin/bash", "-c"]
-# this is the only layer that starts ag0
-RUN . ./upgrade-test-scripts/start_ag0.sh
-
-## UPGRADE+TEST
-## this is agoric-upgrade-8 aka pismoA
-FROM ghcr.io/agoric/agoric-sdk:29 as agoric-upgrade-8
-ARG BOOTSTRAP_MODE
-ENV THIS_NAME=agoric-upgrade-8 BOOTSTRAP_MODE=${BOOTSTRAP_MODE}
-# copy from previous build
-COPY --from=agoric-upgrade-7-2 /root/.agoric /root/.agoric
-
-# boilerplate to copy scripts for this upgrade
-WORKDIR /usr/src/agoric-sdk/
-COPY ./env_setup.sh ./start_to_to.sh ./upgrade-test-scripts/
-COPY ./${THIS_NAME} ./upgrade-test-scripts/${THIS_NAME}/
-RUN chmod +x ./upgrade-test-scripts/*.sh
-SHELL ["/bin/bash", "-c"]
-RUN . ./upgrade-test-scripts/start_to_to.sh
-
-## UPGRADE+TEST
-ARG DEST_IMAGE
-#this is agoric-upgrade-8-1 aka pismoB
-FROM ghcr.io/agoric/agoric-sdk:30 as agoric-upgrade-8-1
-ARG BOOTSTRAP_MODE UPGRADE_INFO_9
-ENV THIS_NAME=agoric-upgrade-8-1 UPGRADE_TO=agoric-upgrade-9 UPGRADE_INFO=${UPGRADE_INFO_9} BOOTSTRAP_MODE=${BOOTSTRAP_MODE}
-WORKDIR /usr/src/agoric-sdk/
-COPY ./env_setup.sh ./start_to_to.sh ./upgrade-test-scripts/
-COPY ./${THIS_NAME} ./upgrade-test-scripts/${THIS_NAME}/
-COPY --from=agoric-upgrade-8 /root/.agoric /root/.agoric
-RUN chmod +x ./upgrade-test-scripts/*.sh
-SHELL ["/bin/bash", "-c"]
-RUN . ./upgrade-test-scripts/start_to_to.sh
-
-# UPGRADE+TEST
-ARG DEST_IMAGE
-# this is agoric-upgrade-9 / pismoC with upgrade to agoric-upgrade-10
-FROM ghcr.io/agoric/agoric-sdk:31 as agoric-upgrade-9
-ARG BOOTSTRAP_MODE UPGRADE_INFO_10
-ENV THIS_NAME=agoric-upgrade-9 UPGRADE_TO=agoric-upgrade-10 UPGRADE_INFO=${UPGRADE_INFO_10} BOOTSTRAP_MODE=${BOOTSTRAP_MODE}
-
-WORKDIR /usr/src/agoric-sdk/
-COPY ./env_setup.sh ./start_to_to.sh ./upgrade-test-scripts/
-COPY ./${THIS_NAME} ./upgrade-test-scripts/${THIS_NAME}/
-COPY --from=agoric-upgrade-8-1 /root/.agoric /root/.agoric
-WORKDIR /usr/src/agoric-sdk/
-RUN chmod +x ./upgrade-test-scripts/*.sh
-SHELL ["/bin/bash", "-c"]
-RUN . ./upgrade-test-scripts/start_to_to.sh
-
-# UPGRADE+TEST
-ARG DEST_IMAGE
-#this is agoric-upgrade-10 / vaults
-FROM ghcr.io/agoric/agoric-sdk:35 as agoric-upgrade-10
-ARG BOOTSTRAP_MODE
-ENV THIS_NAME=agoric-upgrade-10 USE_JS=1 BOOTSTRAP_MODE=${BOOTSTRAP_MODE}
-
-WORKDIR /usr/src/agoric-sdk/
-COPY ./env_setup.sh ./start_to_to.sh ./package.json ./*.js ./upgrade-test-scripts/
-RUN cd upgrade-test-scripts && yarn
-RUN echo '. /usr/src/agoric-sdk/upgrade-test-scripts/env_setup.sh' >> ~/.bashrc
-
-COPY ./${THIS_NAME} ./upgrade-test-scripts/${THIS_NAME}/
-COPY --from=agoric-upgrade-9 /root/.agoric /root/.agoric
-RUN chmod +x ./upgrade-test-scripts/*.sh
-SHELL ["/bin/bash", "-c"]
-RUN . ./upgrade-test-scripts/start_to_to.sh
-
 # UPGRADE
-ARG DEST_IMAGE
-#this is agoric-upgrade-10 upgrading to 11
-#it's a separate target because agoric-upgrade-10 takes so long to test
-FROM ghcr.io/agoric/agoric-sdk:35 as propose-agoric-upgrade-11
-ARG BOOTSTRAP_MODE UPGRADE_INFO_11
-ENV THIS_NAME=propose-agoric-upgrade-11 UPGRADE_TO=agoric-upgrade-11 UPGRADE_INFO=${UPGRADE_INFO_11} BOOTSTRAP_MODE=${BOOTSTRAP_MODE}
-WORKDIR /usr/src/agoric-sdk/
-COPY ./env_setup.sh ./start_to_to.sh ./upgrade-test-scripts/
-RUN cd upgrade-test-scripts && yarn
-RUN echo '. /usr/src/agoric-sdk/upgrade-test-scripts/env_setup.sh' >> ~/.bashrc
-
-COPY ./${THIS_NAME} ./upgrade-test-scripts/${THIS_NAME}/
-COPY --from=agoric-upgrade-10 /root/.agoric /root/.agoric
-RUN chmod +x ./upgrade-test-scripts/*.sh
-SHELL ["/bin/bash", "-c"]
-RUN . ./upgrade-test-scripts/start_to_to.sh
-
-# TEST
-#this is agoric-upgrade-11 / vaults+1
-ARG DEST_IMAGE
-FROM ghcr.io/agoric/agoric-sdk:36 as agoric-upgrade-11
-ARG BOOTSTRAP_MODE
-ENV THIS_NAME=agoric-upgrade-11 BOOTSTRAP_MODE=${BOOTSTRAP_MODE} USE_JS=1
-# start-chain boilerplate
-WORKDIR /usr/src/agoric-sdk/
-COPY ./env_setup.sh ./start_to_to.sh ./package.json ./*.js ./upgrade-test-scripts/
-RUN cd upgrade-test-scripts && yarn
-RUN echo '. /usr/src/agoric-sdk/upgrade-test-scripts/env_setup.sh' >> ~/.bashrc
-
-COPY ./${THIS_NAME} ./upgrade-test-scripts/${THIS_NAME}/
-COPY --from=propose-agoric-upgrade-11 /root/.agoric /root/.agoric
-RUN chmod +x ./upgrade-test-scripts/*.sh
-SHELL ["/bin/bash", "-c"]
-RUN . ./upgrade-test-scripts/start_to_to.sh
-
-# UPGRADE
-ARG DEST_IMAGE
-FROM ghcr.io/agoric/agoric-sdk:36 as propose-agoric-upgrade-12
+FROM ${BASE_IMAGE} as propose-agoric-upgrade-12
 # TODO: Replace with actual Zoe core proposal for upgrade 12 (MCS, Kread, Zoe, restart-contracts, etc)
 ARG BOOTSTRAP_MODE UPGRADE_INFO_12='{"coreProposals":["@agoric/builders/scripts/vats/init-network.js"]}'
-ENV THIS_NAME=propose-agoric-upgrade-12 UPGRADE_TO=agoric-upgrade-12 UPGRADE_INFO=${UPGRADE_INFO_12} BOOTSTRAP_MODE=${BOOTSTRAP_MODE}
-COPY --from=agoric-upgrade-11 /root/.agoric /root/.agoric
-# start-chain boilerplate
-WORKDIR /usr/src/agoric-sdk/
-COPY ./env_setup.sh ./start_to_to.sh ./upgrade-test-scripts/
-RUN cd upgrade-test-scripts && yarn
-RUN echo '. /usr/src/agoric-sdk/upgrade-test-scripts/env_setup.sh' >> ~/.bashrc
+ENV THIS_NAME= UPGRADE_TO=agoric-upgrade-12 UPGRADE_INFO=${UPGRADE_INFO_12} BOOTSTRAP_MODE=${BOOTSTRAP_MODE}
 
-COPY ./${THIS_NAME} ./upgrade-test-scripts/${THIS_NAME}/
-RUN chmod +x ./upgrade-test-scripts/*.sh
+WORKDIR /usr/src/agoric-sdk/
+COPY --chmod=755 ./env_setup.sh ./start_to_to.sh ./upgrade-test-scripts/
 SHELL ["/bin/bash", "-c"]
 RUN . ./upgrade-test-scripts/start_to_to.sh
 
diff --git a/packages/deployment/upgrade-test/Makefile b/packages/deployment/upgrade-test/Makefile
index 6542b5a6b6f..5ab47afa0f4 100644
--- a/packages/deployment/upgrade-test/Makefile
+++ b/packages/deployment/upgrade-test/Makefile
@@ -13,28 +13,7 @@ BUILD = docker build --progress=plain $(BUILD_OPTS) \
 	--build-arg BOOTSTRAP_MODE=$(BOOTSTRAP_MODE) --build-arg DEST_IMAGE=$(DEST_IMAGE) \
 	-f Dockerfile upgrade-test-scripts
 
-agoric-upgrade-7-2:
-	$(BUILD) --target agoric-upgrade-7-2 -t $(REPOSITORY):agoric-upgrade-7-2
-
-agoric-upgrade-8: agoric-upgrade-7-2
-	$(BUILD) --target agoric-upgrade-8 -t $(REPOSITORY):agoric-upgrade-8
-
-agoric-upgrade-8-1: agoric-upgrade-8
-	$(BUILD) --target agoric-upgrade-8-1 -t $(REPOSITORY):agoric-upgrade-8-1
-
-agoric-upgrade-9: agoric-upgrade-8-1
-	$(BUILD) --target agoric-upgrade-9 -t $(REPOSITORY):agoric-upgrade-9
-
-agoric-upgrade-10: agoric-upgrade-9
-	$(BUILD) --target agoric-upgrade-10 -t $(REPOSITORY):agoric-upgrade-10
-
-propose-agoric-upgrade-11: agoric-upgrade-10
-	$(BUILD) --target propose-agoric-upgrade-11 -t $(REPOSITORY):propose-agoric-upgrade-11
-
-agoric-upgrade-11: propose-agoric-upgrade-11
-	$(BUILD) --target agoric-upgrade-11 -t $(REPOSITORY):agoric-upgrade-11
-
-propose-agoric-upgrade-12: agoric-upgrade-11
+propose-agoric-upgrade-12:
 	$(BUILD) --target propose-agoric-upgrade-12 -t $(REPOSITORY):propose-agoric-upgrade-12$(TAG_SUFFIX)
 
 agoric-upgrade-12: propose-agoric-upgrade-12
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/actions.js b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/actions.js
deleted file mode 100644
index 569fdde2286..00000000000
--- a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/actions.js
+++ /dev/null
@@ -1,290 +0,0 @@
-import { promises as fs } from 'fs';
-import assert from 'assert';
-
-import {
-  agd,
-  agoric,
-  agops,
-  agopsLocation,
-  executeCommand,
-} from '../cliHelper.js';
-import {
-  HOME,
-  ATOM_DENOM,
-  GOV1ADDR,
-  GOV2ADDR,
-  GOV3ADDR,
-} from '../constants.js';
-import {
-  waitForBlock,
-  executeOffer,
-  getUser,
-  provisionSmartWallet,
-} from '../commonUpgradeHelpers.js';
-
-const govAccounts = [GOV1ADDR, GOV2ADDR, GOV3ADDR];
-
-const acceptEC = async () => {
-  console.log('ACTIONS Tickling the wallets so they are revived');
-
-  let voter = 0;
-  for (const account of govAccounts) {
-    console.log(`${account}: 1: Accepting EC Committee`);
-
-    try {
-      const params = ['ec', 'committee', '--send-from', account];
-      await executeCommand(agopsLocation, params, {
-        timeout: 30000,
-      });
-    } catch (error) {
-      console.warn(error.message);
-    }
-
-    await waitForBlock(3);
-
-    console.log(`${account}: 2: Accepting EC Committee`);
-
-    try {
-      await agops.ec('committee', '--send-from', account, '--voter', voter);
-    } catch (error) {
-      console.warn(error.message);
-    }
-
-    voter += 1;
-
-    await waitForBlock(3);
-
-    console.log(`${account}: Accepting EC Charter`);
-
-    try {
-      await agops.ec('charter', '--send-from', account);
-    } catch (error) {
-      console.warn(error.message);
-    }
-  }
-};
-
-const acceptOracles = oracles => {
-  const promiseArray = [];
-
-  for (const oracle of oracles) {
-    console.log(`${oracle.address}: Accept oracle invitations`);
-    promiseArray.push(
-      executeOffer(
-        oracle.address,
-        agops.oracle('accept', '--offerId', oracle.id),
-      ),
-    );
-  }
-
-  return Promise.all(promiseArray);
-};
-
-const proposeNewAuctionParams = async (
-  address,
-  startFequency,
-  clockStep,
-  priceLockPeriod,
-) => {
-  const charterAcceptOfferId = await agops.ec(
-    'find-continuing-id',
-    '--for',
-    `${'charter\\ member\\ invitation'}`,
-    '--from',
-    address,
-  );
-
-  return executeOffer(
-    address,
-    agops.auctioneer(
-      'proposeParamChange',
-      '--charterAcceptOfferId',
-      charterAcceptOfferId,
-      '--start-frequency',
-      startFequency,
-      '--clock-step',
-      clockStep,
-      '--price-lock-period',
-      priceLockPeriod,
-    ),
-  );
-};
-
-const voteForNewParams = (accounts, position) => {
-  return Promise.all(
-    accounts.map(account =>
-      agops.ec('vote', '--forPosition', position, '--send-from', account),
-    ),
-  );
-};
-
-const paramChangeOfferGeneration = async (
-  previousOfferId,
-  voteDur,
-  debtLimit,
-) => {
-  const ISTunit = 1_000_000n; // aka displayInfo: { decimalPlaces: 6 }
-  const voteDurSec = BigInt(voteDur);
-  const debtLimitValue = BigInt(debtLimit) * ISTunit;
-  const toSec = ms => BigInt(Math.round(ms / 1000));
-
-  const id = `propose-${Date.now()}`;
-  const deadline = toSec(Date.now()) + voteDurSec;
-
-  const zip = (xs, ys) => xs.map((x, i) => [x, ys[i]]);
-  const fromSmallCapsEntries = txt => {
-    const { body, slots } = JSON.parse(txt);
-    const theEntries = zip(JSON.parse(body.slice(1)), slots).map(
-      ([[name, ref], boardID]) => {
-        const iface = ref.replace(/^\$\d+\./, '');
-        return [name, { iface, boardID }];
-      },
-    );
-    return Object.fromEntries(theEntries);
-  };
-
-  const slots = []; // XXX global mutable state
-  const smallCaps = {
-    Nat: n => `+${n}`,
-    // XXX mutates obj
-    ref: obj => {
-      if (obj.ix) return obj.ix;
-      const ix = slots.length;
-      slots.push(obj.boardID);
-      obj.ix = `$${ix}.Alleged: ${obj.iface}`;
-      return obj.ix;
-    },
-  };
-
-  const instance = fromSmallCapsEntries(
-    await agoric.follow('-lF', ':published.agoricNames.instance', '-o', 'text'),
-  );
-  assert(instance.VaultFactory);
-
-  const brand = fromSmallCapsEntries(
-    await agoric.follow('-lF', ':published.agoricNames.brand', '-o', 'text'),
-  );
-  assert(brand.IST);
-  assert(brand.ATOM);
-
-  const body = {
-    method: 'executeOffer',
-    offer: {
-      id,
-      invitationSpec: {
-        invitationMakerName: 'VoteOnParamChange',
-        previousOffer: previousOfferId,
-        source: 'continuing',
-      },
-      offerArgs: {
-        deadline: smallCaps.Nat(deadline),
-        instance: smallCaps.ref(instance.VaultFactory),
-        params: {
-          DebtLimit: {
-            brand: smallCaps.ref(brand.IST),
-            value: smallCaps.Nat(debtLimitValue),
-          },
-        },
-        path: {
-          paramPath: {
-            key: {
-              collateralBrand: smallCaps.ref(brand.ATOM),
-            },
-          },
-        },
-      },
-      proposal: {},
-    },
-  };
-
-  const capData = { body: `#${JSON.stringify(body)}`, slots };
-  return JSON.stringify(capData);
-};
-
-export const provisionWallet = async user => {
-  const userKeyData = await agd.keys('add', user, '--keyring-backend=test');
-  await fs.writeFile(`${HOME}/.agoric/${user}.key`, userKeyData.mnemonic);
-
-  const userAddress = await getUser(user);
-
-  await provisionSmartWallet(
-    userAddress,
-    `20000000ubld,100000000${ATOM_DENOM}`,
-  );
-  await waitForBlock();
-};
-
-export const implementNewAuctionParams = async (
-  address,
-  oracles,
-  startFequency,
-  clockStep,
-  priceLockPeriod,
-) => {
-  await acceptEC();
-  await waitForBlock(3);
-
-  await acceptOracles(oracles);
-
-  await proposeNewAuctionParams(
-    address,
-    startFequency,
-    clockStep,
-    priceLockPeriod,
-  );
-
-  console.log('ACTIONS voting for new auction params');
-  await voteForNewParams(govAccounts, 0);
-
-  console.log('ACTIONS wait for the vote deadline to pass');
-  await new Promise(r => setTimeout(r, 65000));
-};
-
-export const proposeNewDebtCeiling = async address => {
-  const charterAcceptOfferId = await agops.ec(
-    'find-continuing-id',
-    '--for',
-    `${'charter\\ member\\ invitation'}`,
-    '--from',
-    address,
-  );
-
-  return executeOffer(
-    address,
-    paramChangeOfferGeneration(charterAcceptOfferId, 30, 123000000),
-  );
-};
-
-export const raiseDebtCeiling = async address => {
-  console.log('ACTIONS Raising debt limit');
-
-  await proposeNewDebtCeiling(address);
-  await voteForNewParams(govAccounts, 0);
-
-  console.log('ACTIONS wait for the vote to pass');
-  await new Promise(r => setTimeout(r, 65000));
-};
-
-export const pushPrice = (oracles, price = 10.0) => {
-  console.log(`ACTIONS pushPrice ${price}`);
-  const promiseArray = [];
-
-  for (const oracle of oracles) {
-    console.log(`Pushing Price from oracle ${oracle.address}`);
-
-    promiseArray.push(
-      executeOffer(
-        oracle.address,
-        agops.oracle(
-          'pushPriceRound',
-          '--price',
-          price,
-          '--oracleAdminAcceptOfferId',
-          oracle.id,
-        ),
-      ),
-    );
-  }
-
-  return Promise.all(promiseArray);
-};
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/actions.test.js b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/actions.test.js
deleted file mode 100644
index a11e28ff4e4..00000000000
--- a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/actions.test.js
+++ /dev/null
@@ -1,102 +0,0 @@
-import test from 'ava';
-
-import {
-  provisionWallet,
-  implementNewAuctionParams,
-  raiseDebtCeiling,
-  pushPrice,
-} from './actions.js';
-import { agd, agoric, agops } from '../cliHelper.js';
-import { GOV1ADDR, GOV2ADDR } from '../constants.js';
-import { getUser, newOfferId, waitForBlock } from '../commonUpgradeHelpers.js';
-import { submitDeliverInbound } from './upgradeHelpers.js';
-import { openVault, adjustVault, closeVault } from '../econHelpers.js';
-
-const START_FREQUENCY = 600; // StartFrequency: 600s (auction runs every 10m)
-const CLOCK_STEP = 20; // ClockStep: 20s (ensures auction completes in time)
-const PRICE_LOCK_PERIOD = 300;
-const oraclesAddresses = [GOV1ADDR, GOV2ADDR];
-
-test.before(async t => {
-  await waitForBlock(2);
-  await submitDeliverInbound('user1');
-
-  const oracles = [];
-  for (const oracle of oraclesAddresses) {
-    const offerId = await newOfferId();
-    oracles.push({ address: oracle, id: offerId });
-  }
-
-  t.context.oracles = oracles;
-});
-
-test.serial('Ensure user2 provisioned', async t => {
-  await provisionWallet('user2');
-
-  const user2Address = await getUser('user2');
-  const data = await agd.query(
-    'vstorage',
-    'data',
-    `published.wallet.${user2Address}`,
-  );
-
-  t.not(data.value, '');
-});
-
-test.serial('Ensure auction params have changed', async t => {
-  await implementNewAuctionParams(
-    GOV1ADDR,
-    t.context.oracles,
-    START_FREQUENCY,
-    CLOCK_STEP,
-    PRICE_LOCK_PERIOD,
-  );
-
-  const govParams = await agoric.follow('-lF', ':published.auction.governance');
-  t.is(govParams.current.ClockStep.value.relValue, CLOCK_STEP.toString());
-  t.is(
-    govParams.current.StartFrequency.value.relValue,
-    START_FREQUENCY.toString(),
-  );
-});
-
-test.serial('Ensure debt ceiling raised', async t => {
-  await raiseDebtCeiling(GOV1ADDR);
-  const params = await agoric.follow(
-    '-lF',
-    ':published.vaultFactory.managers.manager0.governance',
-  );
-  t.is(params.current.DebtLimit.value.value, '123000000000000');
-});
-
-test.serial('Update oracle prices', async t => {
-  await pushPrice(t.context.oracles, 12.01);
-
-  t.pass();
-});
-
-test.serial('Open Vaults', async t => {
-  const currentVaults = await agops.vaults('list', '--from', GOV1ADDR);
-  t.is(currentVaults.length, 0);
-
-  const vaults = [
-    { mint: 5.0, collateral: 9.0 },
-    { mint: 6.0, collateral: 10.0 },
-  ];
-
-  for (const vault of vaults) {
-    await openVault(GOV1ADDR, vault.mint, vault.collateral);
-  }
-
-  await adjustVault(GOV1ADDR, 'vault0', { wantCollateral: 1.0 });
-  await adjustVault(GOV1ADDR, 'vault0', { wantMinted: 1.0 });
-  await closeVault(GOV1ADDR, 'vault1', 6.06);
-
-  const user2 = await getUser('user2');
-  await openVault(user2, 7, 11);
-  await adjustVault(user2, 'vault2', { giveMinted: 1.5 });
-  await adjustVault(user2, 'vault2', { giveCollateral: 2.0 });
-  await closeVault(user2, 'vault2', 5.75);
-
-  t.pass();
-});
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/legacy.sh b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/legacy.sh
deleted file mode 100755
index 1fadfd4804f..00000000000
--- a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/legacy.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/bash
-. /usr/src/agoric-sdk/upgrade-test-scripts/env_setup.sh
-
-make_swing_store_snapshot() {( set -euo pipefail
-  EXPORT_DIR="$1"
-  shift
-  /usr/src/agoric-sdk/packages/cosmic-swingset/src/export-kernel-db.js --home "$HOME/.agoric" --export-dir "$EXPORT_DIR" --verbose --include-export-data "$@"
-
-  EXPORT_MANIFEST_FILE="$EXPORT_DIR/export-manifest.json"
-  EXPORT_DATA_FILE="$EXPORT_DIR/$(cat "$EXPORT_MANIFEST_FILE" | jq -r .data)"
-  EXPORT_DATA_UNTRUSTED_FILE="${EXPORT_DATA_FILE%.*}-untrusted.jsonl"
-  EXPORT_HEIGHT=$(cat "$EXPORT_MANIFEST_FILE" | jq -r .blockHeight)
-  EXPORT_MANIFEST="$(cat $EXPORT_MANIFEST_FILE)"
-
-  mv "$EXPORT_DATA_FILE" "$EXPORT_DATA_UNTRUSTED_FILE"
-  agd export --height $EXPORT_HEIGHT | jq -cr '.app_state.vstorage.data[] | if .path | startswith("swingStore.") then [.path[11:],.value] else empty end' > "$EXPORT_DATA_FILE"
-
-  jq -n "$EXPORT_MANIFEST | .untrustedData=\"$(basename -- "$EXPORT_DATA_UNTRUSTED_FILE")\"" > "$EXPORT_MANIFEST_FILE"
-
-  echo "Successful swing-store export for block $EXPORT_HEIGHT"
-)}
-
-restore_swing_store_snapshot() {( set -euo pipefail
-  rm -f $HOME/.agoric/data/agoric/swingstore.sqlite
-
-  /usr/src/agoric-sdk/packages/cosmic-swingset/src/import-kernel-db.js --home "$HOME/.agoric" --export-dir "$1" --verbose
-)}
-
-compare_swing_store_export_data() {
-  EXPORT_DIR="$1"
-  EXPORT_MANIFEST_FILE="$EXPORT_DIR/export-manifest.json"
-  EXPORT_DATA_FILE="$(cat "$EXPORT_MANIFEST_FILE" | jq -r .data)"
-  EXPORT_DATA_UNTRUSTED_FILE="$(cat "$EXPORT_MANIFEST_FILE" | jq -r .untrustedData)"
-
-  if [ -z "$EXPORT_DATA_FILE" ]; then
-    echo "missing-export-data"
-    return
-  fi
-  
-  if [ -z "$EXPORT_DATA_UNTRUSTED_FILE" ]; then
-    echo "missing-untrusted-export-data"
-    return
-  fi
-  
-  diff <(cat "$EXPORT_DIR/$EXPORT_DATA_FILE" | sort) <(cat "$EXPORT_DIR/$EXPORT_DATA_UNTRUSTED_FILE" | sort) >&2 && {
-    echo "match"
-  } || {
-    echo "mismatch"
-  }
-}
-
-# replicate state-sync of node
-# this will cause the swing-store to prune some data
-# we will save the pruned artifact for later
-killAgd
-EXPORT_DIR=$(mktemp -t -d swing-store-export-upgrade-10-XXX)
-make_swing_store_snapshot $EXPORT_DIR || fail "Couldn't make swing-store snapshot"
-# test_val "$(compare_swing_store_export_data $EXPORT_DIR)" "match" "swing-store export data"
-EXPORT_DIR_ALL_ARTIFACTS=$(mktemp -t -d swing-store-export-upgrade-10-all-artifacts-XXX)
-make_swing_store_snapshot $EXPORT_DIR_ALL_ARTIFACTS --export-mode archival || fail "Couldn't make swing-store snapshot for historical artifacts"
-restore_swing_store_snapshot $EXPORT_DIR || fail "Couldn't restore swing-store snapshot"
-(
-    cd $EXPORT_DIR_ALL_ARTIFACTS
-    mkdir $HOME/.agoric/data/agoric/swing-store-historical-artifacts
-    for i in *; do
-        [ -f $EXPORT_DIR/$i ] && continue
-        mv $i $HOME/.agoric/data/agoric/swing-store-historical-artifacts/
-    done
-)
-rm -rf $EXPORT_DIR
-rm -rf $EXPORT_DIR_ALL_ARTIFACTS
-
-startAgd
-sleep 5
-killAgd
-
-EXPORT_DIR=$(mktemp -t -d swing-store-export-upgrade-10-XXX)
-make_swing_store_snapshot $EXPORT_DIR || fail "Couldn't make swing-store snapshot"
-test_val "$(compare_swing_store_export_data $EXPORT_DIR)" "mismatch" "swing-store broken state-sync"
-rm -rf $EXPORT_DIR
-startAgd
-
-# # TODO fully test bidding
-# # TODO test liquidations
-agops inter bid by-price --price 1 --give 1.0IST  --from $GOV1ADDR --keyring-backend test
\ No newline at end of file
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/post.test.js b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/post.test.js
deleted file mode 100644
index 9e6ac511c38..00000000000
--- a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/post.test.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import test from 'ava';
-
-import { agd, agoric } from '../cliHelper.js';
-import { GOV1ADDR, GOV2ADDR, GOV3ADDR, USER1ADDR } from '../constants.js';
-import { calculateWalletState } from '../commonUpgradeHelpers.js';
-
-test('DeliverInbound from un-provisioned account is discarded', async t => {
-  const result = await agd.query('swingset', 'mailbox', USER1ADDR);
-  const value = JSON.parse(result.value);
-  t.is(value.outbox.length, 0);
-});
-
-test('provision pool has right balance', async t => {
-  const result = await agd.query(
-    'bank',
-    'balances',
-    'agoric1megzytg65cyrgzs6fvzxgrcqvwwl7ugpt62346',
-  );
-  t.is(result.balances[0].amount, '18750000');
-});
-
-test('Validate wallet state', async t => {
-  t.is(await calculateWalletState(USER1ADDR), 'upgraded');
-  t.is(await calculateWalletState(GOV1ADDR), 'revived');
-  t.is(await calculateWalletState(GOV2ADDR), 'revived');
-  t.is(await calculateWalletState(GOV3ADDR), 'revived');
-});
-
-test('Validate vaults', async t => {
-  const vaults = await agd.query(
-    'vstorage',
-    'children',
-    'published.vaultFactory.managers.manager0.vaults',
-  );
-
-  t.is(vaults.children.length, 3);
-
-  const metrics = await agoric.follow(
-    '-lF',
-    ':published.vaultFactory.managers.manager0.metrics',
-  );
-
-  t.is(metrics.numActiveVaults, 1);
-  t.is(metrics.totalDebt.value, '6030000');
-  t.is(metrics.totalCollateral.value, '8000000');
-
-  const vault0 = await agoric.follow(
-    '-lF',
-    ':published.vaultFactory.managers.manager0.vaults.vault0',
-  );
-  t.is(vault0.vaultState, 'active');
-  t.is(vault0.locked.value, '8000000');
-  t.is(vault0.debtSnapshot.debt.value, '6030000');
-
-  const vault1 = await agoric.follow(
-    '-lF',
-    ':published.vaultFactory.managers.manager0.vaults.vault1',
-  );
-  t.is(vault1.vaultState, 'closed');
-  t.is(vault1.locked.value, '0');
-  t.is(vault1.debtSnapshot.debt.value, '0');
-
-  const vault2 = await agoric.follow(
-    '-lF',
-    ':published.vaultFactory.managers.manager0.vaults.vault2',
-  );
-  t.is(vault2.vaultState, 'closed');
-  t.is(vault2.locked.value, '0');
-  t.is(vault2.debtSnapshot.debt.value, '0');
-});
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/pre.test.js b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/pre.test.js
deleted file mode 100644
index 57acca70dc8..00000000000
--- a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/pre.test.js
+++ /dev/null
@@ -1,215 +0,0 @@
-import test from 'ava';
-
-import { promises as fs } from 'fs';
-
-import { agd, agoric, agops } from '../cliHelper.js';
-
-import {
-  GOV1ADDR,
-  GOV2ADDR,
-  GOV3ADDR,
-  BOOTSTRAP_MODE,
-  PSM_PAIR,
-} from '../constants.js';
-import { openVault } from '../econHelpers.js';
-import { getUser, waitForBlock } from '../commonUpgradeHelpers.js';
-
-test.before(async () => {
-  console.log('Wait for upgrade to settle');
-
-  await waitForBlock(20);
-});
-
-test(`Ensure there's only uist`, async t => {
-  const result = await agd.query(
-    'bank',
-    'balances',
-    'agoric1megzytg65cyrgzs6fvzxgrcqvwwl7ugpt62346',
-  );
-
-  t.is(result.balances.length, 1);
-  t.is(result.balances[0].denom, 'uist');
-});
-
-test('Ensure gov1 provisioned', async t => {
-  const result = await agd.query(
-    'vstorage',
-    'data',
-    `published.wallet.${GOV1ADDR}`,
-  );
-
-  t.not(result.value.length, 0);
-});
-
-test('Ensure gov2 provisioned', async t => {
-  const result = await agd.query(
-    'vstorage',
-    'data',
-    `published.wallet.${GOV2ADDR}`,
-  );
-
-  t.not(result.value.length, 0);
-});
-
-test('Ensure gov3 provisioned', async t => {
-  const result = await agd.query(
-    'vstorage',
-    'data',
-    `published.wallet.${GOV3ADDR}`,
-  );
-
-  t.not(result.value.length, 0);
-});
-
-test('Ensure user2 not provisioned', async t => {
-  try {
-    await getUser('user2');
-    t.fail();
-  } catch (error) {
-    t.pass();
-  }
-});
-
-test('Ensure no vaults exist', async t => {
-  const result = await agd.query(
-    'vstorage',
-    'data',
-    `published.vaultFactory.manager0.vaults.vault0`,
-  );
-
-  t.is(result.value, '');
-});
-
-test(`Provision pool has right balance`, async t => {
-  const result = await agd.query(
-    'bank',
-    'balances',
-    'agoric1megzytg65cyrgzs6fvzxgrcqvwwl7ugpt62346',
-  );
-
-  t.is(result.balances[0].amount, '19000000');
-});
-
-test('Validate PSM denoms', async t => {
-  const psmISTChildren = await agd.query(
-    'vstorage',
-    'children',
-    'published.psm.IST',
-  );
-
-  t.not(psmISTChildren.children.legnth, 0);
-
-  let denoms = ['USDC_axl', 'DAI_axl', 'DAI_grv'];
-  if (BOOTSTRAP_MODE === 'main') {
-    denoms = [...denoms, 'USDC_grv', 'USDT_axl', 'USDT_grv'];
-  } else {
-    denoms = [...denoms, 'ToyUSD'];
-  }
-
-  for (const denom of denoms) {
-    t.truthy(psmISTChildren.children.includes(denom));
-  }
-});
-
-test('PSM gov params were preserved', async t => {
-  const toyUSDGovernance = await agoric.follow(
-    '-lF',
-    `:published.psm.${PSM_PAIR}.governance`,
-  );
-
-  const psmGovernanceData = await fs.readFile(
-    '/root/.agoric/psm_governance.json',
-    'binary',
-  );
-
-  const psmGovernance = JSON.parse(psmGovernanceData);
-
-  t.not(toyUSDGovernance.current.MintLimit.value.value, '0');
-  t.is(
-    toyUSDGovernance.current.MintLimit.value.value,
-    psmGovernance.current.MintLimit.value.value,
-  );
-  t.is(toyUSDGovernance.current.GiveMintedFee.value.numerator.value, '0');
-  t.is(
-    toyUSDGovernance.current.GiveMintedFee.value.denominator.value,
-    psmGovernance.current.GiveMintedFee.value.denominator.value,
-  );
-  t.is(toyUSDGovernance.current.WantMintedFee.value.numerator.value, '0');
-  t.is(
-    toyUSDGovernance.current.WantMintedFee.value.denominator.value,
-    psmGovernance.current.WantMintedFee.value.denominator.value,
-  );
-});
-
-test('PSM metric params were preserved', async t => {
-  const toyUSDMetrics = await agoric.follow(
-    '-lF',
-    `:published.psm.${PSM_PAIR}.metrics`,
-  );
-
-  const psmMetricsData = await fs.readFile(
-    '/root/.agoric/psm_metrics.json',
-    'binary',
-  );
-
-  const psmMetrics = JSON.parse(psmMetricsData);
-
-  t.is(
-    toyUSDMetrics.anchorPoolBalance.value,
-    psmMetrics.anchorPoolBalance.value,
-  );
-  t.is(toyUSDMetrics.feePoolBalance.value, psmMetrics.feePoolBalance.value);
-  t.is(
-    toyUSDMetrics.mintedPoolBalance.value,
-    psmMetrics.mintedPoolBalance.value,
-  );
-  t.is(
-    toyUSDMetrics.totalMintedProvided.value,
-    psmMetrics.totalMintedProvided.value,
-  );
-});
-
-test('Provision pool metrics are retained across vaults upgrade', async t => {
-  const provisionPoolMetrics = await agoric.follow(
-    '-lF',
-    ':published.provisionPool.metrics',
-  );
-
-  const provisionPoolMetricsData = await fs.readFile(
-    '/root/.agoric/provision_pool_metrics.json',
-    'binary',
-  );
-
-  const testProvisionPoolMetrics = JSON.parse(provisionPoolMetricsData);
-
-  t.is(
-    provisionPoolMetrics.totalMintedConverted.value,
-    testProvisionPoolMetrics.totalMintedConverted.value,
-  );
-  t.is(
-    provisionPoolMetrics.totalMintedProvided.value,
-    testProvisionPoolMetrics.totalMintedProvided.value,
-  );
-  t.is(
-    provisionPoolMetrics.walletsProvisioned,
-    testProvisionPoolMetrics.walletsProvisioned,
-  );
-});
-
-test('Pre Vault tests', async t => {
-  try {
-    await openVault(GOV1ADDR, 5, 9);
-    t.fail();
-  } catch (error) {
-    t.truthy(
-      error.message.includes(
-        "'Error: maxDebtFor called before a collateral quote was available'",
-      ),
-    );
-  }
-});
-
-test('Gov1 has no vaults', async t => {
-  const vaults = await agops.vaults('list', '--from', GOV1ADDR);
-  t.is(vaults.length, 0);
-});
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/upgradeHelpers.js b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/upgradeHelpers.js
deleted file mode 100644
index 5a81b731d55..00000000000
--- a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/upgradeHelpers.js
+++ /dev/null
@@ -1,70 +0,0 @@
-/* eslint-disable @jessie.js/safe-await-separator */
-import { $ } from 'execa';
-
-import {
-  GOV1ADDR,
-  GOV2ADDR,
-  GOV3ADDR,
-  VALIDATORADDR,
-  USER1ADDR,
-  CHAINID,
-} from '../constants.js';
-
-import { agd } from '../cliHelper.js';
-import { getUser } from '../commonUpgradeHelpers.js';
-
-export const printKeys = async () => {
-  console.log('========== GOVERNANCE KEYS ==========');
-
-  console.log(`gov1: ${GOV1ADDR}`);
-  const gov1Key = await $`cat /root/.agoric/gov1.key`;
-  console.log(gov1Key.stdout);
-
-  console.log(`gov2: ${GOV2ADDR}`);
-  const gov2Key = await $`cat /root/.agoric/gov2.key`;
-  console.log(gov2Key.stdout);
-
-  console.log(`gov3: ${GOV3ADDR}`);
-  const gov3Key = await $`cat /root/.agoric/gov3.key`;
-  console.log(gov3Key.stdout);
-
-  console.log(`validator: ${VALIDATORADDR}`);
-  const validatorKey = await $`cat /root/.agoric/validator.key`;
-  console.log(validatorKey.stdout);
-
-  console.log(`user1: ${USER1ADDR}`);
-  const user1Key = await $`cat /root/.agoric/user1.key`;
-  console.log(user1Key.stdout);
-
-  const user2Address = await getUser('user2');
-
-  console.log(`user2: ${user2Address}`);
-  const user2Key = await $`cat /root/.agoric/user1.key`;
-  console.log(user2Key.stdout);
-};
-
-// submit a DeliverInbound transaction
-//
-// see {agoric.swingset.MsgDeliverInbound} in swingset/msgs.proto
-// https://github.com/Agoric/agoric-sdk/blob/5cc5ec8836dcd0c6e11b10799966b6e74601295d/golang/cosmos/proto/agoric/swingset/msgs.proto#L23
-export const submitDeliverInbound = async sender => {
-  // ag-solo is a client that sends DeliverInbound transactions using a golang client
-  // @see {connectToChain} in chain-cosmos-sdk.js
-  // runHelper
-  // https://github.com/Agoric/agoric-sdk/blob/5cc5ec8836dcd0c6e11b10799966b6e74601295d/packages/solo/src/chain-cosmos-sdk.js
-
-  // The payload is JSON.stringify([messages, highestAck])
-  // https://github.com/Agoric/agoric-sdk/blob/5cc5ec8836dcd0c6e11b10799966b6e74601295d/packages/solo/src/chain-cosmos-sdk.js#L625
-  // for example, this json was captured from a running `agoric start local-solo`
-  const json = `[[[1,"1:0:deliver:ro+1:rp-44;#[\\"getConfiguration\\",[]]"]],0]`;
-  await agd.tx(
-    'swingset',
-    'deliver',
-    `'${json}'`,
-    `--chain-id="${CHAINID}"`,
-    '--yes',
-    `--from="${sender}"`,
-    '--keyring-backend=test',
-    '-b block',
-  );
-};
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-11/actions.test.js b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-11/actions.test.js
deleted file mode 100644
index 58063c1cf2e..00000000000
--- a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-11/actions.test.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import test from 'ava';
-
-import { agoric, agops } from '../cliHelper.js';
-import { GOV1ADDR } from '../constants.js';
-import { openVault, adjustVault, closeVault } from '../econHelpers.js';
-
-test.serial('Open Vaults', async t => {
-  const currentVaults = await agops.vaults('list', '--from', GOV1ADDR);
-  t.is(currentVaults.length, 2);
-
-  await openVault(GOV1ADDR, 7, 11);
-  await adjustVault(GOV1ADDR, 'vault3', { giveMinted: 1.5 });
-  await adjustVault(GOV1ADDR, 'vault3', { giveCollateral: 2.0 });
-  await closeVault(GOV1ADDR, 'vault3', 5.75);
-
-  const vault3 = await agoric.follow(
-    '-lF',
-    ':published.vaultFactory.managers.manager0.vaults.vault3',
-  );
-  t.is(vault3.vaultState, 'closed');
-  t.is(vault3.locked.value, '0');
-  t.is(vault3.debtSnapshot.debt.value, '0');
-});
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-11/legacy.sh b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-11/legacy.sh
deleted file mode 100755
index bb785bf2c97..00000000000
--- a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-11/legacy.sh
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/bash
-
-. ./upgrade-test-scripts/env_setup.sh
-
-# Enable debugging
-set -x
-
-export_genesis() {
-  GENESIS_EXPORT_DIR="$1"
-  shift
-  GENESIS_HEIGHT_ARG=
-
-  if [ -n "$1" ]; then
-    GENESIS_HEIGHT_ARG="--height $1"
-    shift
-  fi
-
-  agd export --export-dir "$GENESIS_EXPORT_DIR" $GENESIS_HEIGHT_ARG "$@"
-}
-
-make_swing_store_snapshot() {( set -euo pipefail
-  EXPORT_DIR="$1"
-  shift
-  /usr/src/agoric-sdk/packages/cosmic-swingset/src/export-kernel-db.js --home "$HOME/.agoric" --export-dir "$EXPORT_DIR" --verbose --artifact-mode replay --export-data-mode all "$@"
-
-  EXPORT_MANIFEST_FILE="$EXPORT_DIR/export-manifest.json"
-  EXPORT_HEIGHT=$(cat "$EXPORT_MANIFEST_FILE" | jq -r .blockHeight)
-  
-  [ "x${WITHOUT_GENESIS_EXPORT:-0}" = "x1" ] || {
-    EXPORT_DATA_FILE="$EXPORT_DIR/$(cat "$EXPORT_MANIFEST_FILE" | jq -r .data)"
-    EXPORT_DATA_UNTRUSTED_FILE="${EXPORT_DATA_FILE%.*}-untrusted.jsonl"
-    EXPORT_MANIFEST="$(cat $EXPORT_MANIFEST_FILE)"
-
-    mv "$EXPORT_DATA_FILE" "$EXPORT_DATA_UNTRUSTED_FILE"
-    export_genesis "$EXPORT_DIR/genesis-export" $EXPORT_HEIGHT 
-    cat $EXPORT_DIR/genesis-export/genesis.json | jq -cr '.app_state.swingset.swing_store_export_data[] | [.key,.value]' > "$EXPORT_DATA_FILE"
-
-    jq -n "$EXPORT_MANIFEST | .untrustedData=\"$(basename -- "$EXPORT_DATA_UNTRUSTED_FILE")\"" > "$EXPORT_MANIFEST_FILE"
-  }
-
-  echo "Successful swing-store export for block $EXPORT_HEIGHT"
-)}
-
-restore_swing_store_snapshot() {( set -euo pipefail
-  rm -f $HOME/.agoric/data/agoric/swingstore.sqlite
-  EXPORT_DIR="$1"
-  shift
-
-  /usr/src/agoric-sdk/packages/cosmic-swingset/src/import-kernel-db.js --home "$HOME/.agoric" --export-dir "$EXPORT_DIR" --verbose --artifact-mode replay --export-data-mode all "$@"
-)}
-
-compare_swing_store_export_data() {
-  EXPORT_DIR="$1"
-  EXPORT_MANIFEST_FILE="$EXPORT_DIR/export-manifest.json"
-  EXPORT_DATA_FILE="$(cat "$EXPORT_MANIFEST_FILE" | jq -r .data)"
-  EXPORT_DATA_UNTRUSTED_FILE="$(cat "$EXPORT_MANIFEST_FILE" | jq -r .untrustedData)"
-
-  if [ -z "$EXPORT_DATA_FILE" ]; then
-    echo "missing-export-data"
-    return
-  fi
-  
-  if [ -z "$EXPORT_DATA_UNTRUSTED_FILE" ]; then
-    echo "missing-untrusted-export-data"
-    return
-  fi
-
-  sort $EXPORT_DIR/$EXPORT_DATA_FILE > "${EXPORT_DIR}/sorted_${EXPORT_DATA_FILE}"
-  sort $EXPORT_DIR/$EXPORT_DATA_UNTRUSTED_FILE >  "${EXPORT_DIR}/sorted_${EXPORT_DATA_UNTRUSTED_FILE}"
-
-  diff "${EXPORT_DIR}/sorted_${EXPORT_DATA_FILE}" "${EXPORT_DIR}/sorted_${EXPORT_DATA_UNTRUSTED_FILE}" >&2 && {
-    echo "match"
-  } || {
-    echo "mismatch"
-  }
-}
-
-# hacky restore of pruned artifacts
-killAgd
-EXPORT_DIR=$(mktemp -t -d swing-store-export-upgrade-11-XXX)
-WITHOUT_GENESIS_EXPORT=1 make_swing_store_snapshot $EXPORT_DIR --artifact-mode debug || fail "Couldn't make swing-store snapshot"
-HISTORICAL_ARTIFACTS="$(cd $HOME/.agoric/data/agoric/swing-store-historical-artifacts/; for i in *; do echo -n "[\"$i\",\"$i\"],"; done)"
-mv -n $HOME/.agoric/data/agoric/swing-store-historical-artifacts/* $EXPORT_DIR || fail "some historical artifacts not pruned"
-mv $EXPORT_DIR/export-manifest.json $EXPORT_DIR/export-manifest-original.json
-cat $EXPORT_DIR/export-manifest-original.json | jq -r ".artifacts = .artifacts + [${HISTORICAL_ARTIFACTS%%,}] | del(.artifactMode)" > $EXPORT_DIR/export-manifest.json
-restore_swing_store_snapshot $EXPORT_DIR || fail "Couldn't restore swing-store snapshot"
-startAgd
-rm -rf $EXPORT_DIR
-
-# verify swing-store export-data is consistent and perform genesis style "upgrade"
-killAgd
-EXPORT_DIR=$(mktemp -t -d swing-store-export-upgrade-11-XXX)
-make_swing_store_snapshot $EXPORT_DIR --artifact-mode none || fail "Couldn't make swing-store snapshot"
-test_val "$(compare_swing_store_export_data $EXPORT_DIR)" "match" "swing-store consistent cosmos kvstore"
-
-TMP_GENESIS_DIR=$EXPORT_DIR/genesis-export
-cp $HOME/.agoric/config/genesis.json $TMP_GENESIS_DIR/old_genesis.json
-cp $HOME/.agoric/data/priv_validator_state.json $TMP_GENESIS_DIR/priv_validator_state.json
-rm -rf $HOME/.agoric/data
-mkdir $HOME/.agoric/data
-mv $TMP_GENESIS_DIR/priv_validator_state.json $HOME/.agoric/data
-mv $TMP_GENESIS_DIR/* $HOME/.agoric/config/
-startAgd
-rm -rf $EXPORT_DIR
\ No newline at end of file
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-11/post.test.js b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-11/post.test.js
deleted file mode 100644
index 2ce3d640c13..00000000000
--- a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-11/post.test.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import test from 'ava';
-
-test(`replace with the walletFactory work when it's complete`, t => {
-  t.pass();
-});
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-11/pre.test.js b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-11/pre.test.js
deleted file mode 100644
index 818a0ea5b4f..00000000000
--- a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-11/pre.test.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import test from 'ava';
-
-import { agd, agoric } from '../cliHelper.js';
-import { waitForBlock } from '../commonUpgradeHelpers.js';
-
-test.before(async () => {
-  console.log('Wait for upgrade to settle');
-
-  await waitForBlock(5);
-});
-
-test('Validate vaults', async t => {
-  const vaults = await agd.query(
-    'vstorage',
-    'children',
-    'published.vaultFactory.managers.manager0.vaults',
-  );
-
-  t.is(vaults.children.length, 3);
-
-  const metrics = await agoric.follow(
-    '-lF',
-    ':published.vaultFactory.managers.manager0.metrics',
-  );
-
-  t.is(metrics.numActiveVaults, 1);
-  t.is(metrics.totalDebt.value, '6030000');
-  t.is(metrics.totalCollateral.value, '8000000');
-
-  const vault0 = await agoric.follow(
-    '-lF',
-    ':published.vaultFactory.managers.manager0.vaults.vault0',
-  );
-  t.is(vault0.vaultState, 'active');
-  t.is(vault0.locked.value, '8000000');
-  t.is(vault0.debtSnapshot.debt.value, '6030000');
-
-  const vault1 = await agoric.follow(
-    '-lF',
-    ':published.vaultFactory.managers.manager0.vaults.vault1',
-  );
-  t.is(vault1.vaultState, 'closed');
-  t.is(vault1.locked.value, '0');
-  t.is(vault1.debtSnapshot.debt.value, '0');
-
-  const vault2 = await agoric.follow(
-    '-lF',
-    ':published.vaultFactory.managers.manager0.vaults.vault2',
-  );
-  t.is(vault2.vaultState, 'closed');
-  t.is(vault2.locked.value, '0');
-  t.is(vault2.debtSnapshot.debt.value, '0');
-});
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/actions.test.js b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/actions.test.js
index aa985cf68c6..00e49a04dc9 100644
--- a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/actions.test.js
+++ b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/actions.test.js
@@ -27,25 +27,19 @@ test.before(async t => {
   t.context.bundleIds = await installBundles(bundlesData);
 });
 
-test.serial('Open Vaults', async t => {
+test.skip('Open Vaults', async t => {
   const currentVaults = await agops.vaults('list', '--from', GOV1ADDR);
-  t.is(currentVaults.length, 4);
+  t.is(currentVaults.length, 5);
 
+  // TODO get as return value from openVault
+  const vaultId = 'vault6';
   await openVault(GOV1ADDR, 7, 11);
-  await adjustVault(GOV1ADDR, 'vault5', { giveMinted: 1.5 });
-  await adjustVault(GOV1ADDR, 'vault5', { giveCollateral: 2.0 });
-  await closeVault(GOV1ADDR, 'vault5', 5.75);
-
-  const vault5 = await agoric.follow(
-    '-lF',
-    ':published.vaultFactory.managers.manager0.vaults.vault5',
-  );
-  t.is(vault5.vaultState, 'closed');
-  t.is(vault5.locked.value, '0');
-  t.is(vault5.debtSnapshot.debt.value, '0');
+  await adjustVault(GOV1ADDR, vaultId, { giveMinted: 1.5 });
+  await adjustVault(GOV1ADDR, vaultId, { giveCollateral: 2.0 });
+  await closeVault(GOV1ADDR, vaultId, 5.75);
 });
 
-test.serial('Run Prober (first time)', async t => {
+test.skip('Run Prober (first time)', async t => {
   // @ts-expect-error
   await runProber(t.context.bundleIds['prober-contract']);
   const data = await agd.query('vstorage', 'data', 'published.prober-asid9a');
@@ -53,7 +47,7 @@ test.serial('Run Prober (first time)', async t => {
   t.is(value.values[0], 'false');
 });
 
-test.serial('Upgrade Zoe and ZCF', async t => {
+test.skip('Upgrade Zoe and ZCF', async t => {
   await runZcfUpgrade(
     // @ts-expect-error
     t.context.bundleIds['Zcf-upgrade'],
@@ -64,7 +58,7 @@ test.serial('Upgrade Zoe and ZCF', async t => {
   t.pass();
 });
 
-test.serial('Run Prober (second time)', async t => {
+test.skip('Run Prober (second time)', async t => {
   // @ts-expect-error
   await runProber(t.context.bundleIds['prober-contract']);
 
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/post.test.js b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/post.test.js
index 3ac4cd614da..3ad9bf993e1 100644
--- a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/post.test.js
+++ b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/post.test.js
@@ -1,7 +1,7 @@
 import test from 'ava';
 import { getIncarnation } from './tools/vat-status.js';
 
-test(`verify Zoe vat incarnation`, async t => {
+test.failing(`verify Zoe vat incarnation`, async t => {
   const incarantion = await getIncarnation('zoe');
   t.is(incarantion, 1);
 });
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-8-1/.keep b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-8-1/.keep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-8/.keep b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-8/.keep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-8/actions.sh b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-8/actions.sh
deleted file mode 100644
index 1c2e032f694..00000000000
--- a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-8/actions.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/bash
-set +x 
-. ./upgrade-test-scripts/env_setup.sh
-# apply patch
-sed -i "s/--econCommAcceptOfferId /--previousOfferId /g" "./packages/agoric-cli/src/commands/psm.js"
-
-waitForBlock 3
-# fund provision pool
-stakeamount="20000000${USDC_DENOM}"
-agd tx bank send "validator" "agoric1megzytg65cyrgzs6fvzxgrcqvwwl7ugpt62346" "$stakeamount" -y --keyring-backend=test --chain-id="$CHAINID"
-waitForBlock 3
-
-
-govaccounts=( "$GOV1ADDR" "$GOV2ADDR" "$GOV3ADDR" )
-govamount="200000000ubld,100000000${USDC_DENOM},100000000${ATOM_DENOM}"
-
-for i in "${govaccounts[@]}"
-do
-  provisionSmartWallet "$i" "$govamount"
-done
-
-provisionSmartWallet "$USER1ADDR" "20000000ubld"
-
-waitForBlock 5
-# Accept invitation to economic committee
-for i in "${govaccounts[@]}"; do
-  COMMITTEE_OFFER=$(mktemp -t agopscommittee.XXX)
-  agops psm committee >|"$COMMITTEE_OFFER"
-  if [[ "$i" == "$GOV2ADDR" ]]; then
-    sed -i "s/Voter0/Voter1/g" "$COMMITTEE_OFFER"
-  fi
-  if [[ "$i" == "$GOV3ADDR" ]]; then
-    sed -i "s/Voter0/Voter2/g" "$COMMITTEE_OFFER"
-  fi
-  jq ".body | fromjson" <"$COMMITTEE_OFFER"
-  agops perf satisfaction --from $i --executeOffer $COMMITTEE_OFFER --keyring-backend=test
-  # verify the offerId is readable from chain history
-  agoric wallet show --from $i
-  COMMITTEE_OFFER_ID=$(jq ".body | fromjson | .offer.id" <"$COMMITTEE_OFFER")
-
-  echo "${i}_COMMITTEE_OFFER_ID=$COMMITTEE_OFFER_ID" >> "$HOME/.agoric/envs"
-  waitForBlock 2
-
-# Accept invitation to be a charter member
-  CHARTER_OFFER=$(mktemp -t agopscharter.XXX)
-  agops psm charter >|"$CHARTER_OFFER"
-  jq ".body | fromjson" <"$CHARTER_OFFER"
-  agops perf satisfaction --from $i --executeOffer $CHARTER_OFFER --keyring-backend=test
-
-  # verify the offerId is readable from chain history
-  agoric wallet show --from $i
-  CHARTER_OFFER_ID=$(jq ".body | fromjson | .offer.id" <"$CHARTER_OFFER")
-  echo "${i}_CHARTER_OFFER_ID=$CHARTER_OFFER_ID" >> "$HOME/.agoric/envs"
-done
-
-source "$HOME/.agoric/envs"
-waitForBlock 2
-
-
-# Propose a vote to raise the mint limit
-PROPOSAL_OFFER=$(mktemp -t agops.XXX)
-oid="${GOV1ADDR}_CHARTER_OFFER_ID"
-agops psm proposeChangeMintLimit --pair ${PSM_PAIR} --limit 133337 --previousOfferId "${!oid}" >|"$PROPOSAL_OFFER"
-jq ".body | fromjson" <"$PROPOSAL_OFFER"
-agops perf satisfaction --from $GOV1ADDR --executeOffer $PROPOSAL_OFFER --keyring-backend=test
-
-for i in "${govaccounts[@]}"; do
-  # vote on the question that was made
-  VOTE_OFFER=$(mktemp -t agops.XXX)
-  oid="${i}_COMMITTEE_OFFER_ID"
-  echo "$i using ${!oid}"
-  agops psm vote --pair ${PSM_PAIR} --forPosition 0 --previousOfferId "${!oid}" >|"$VOTE_OFFER"
-  jq ".body | fromjson" <"$VOTE_OFFER"
-
-  agops perf satisfaction --from $i --executeOffer $VOTE_OFFER --keyring-backend=test
-done
-
-## wait for the election to be resolved (1m default in commands/psm.js)
-echo "waiting 1 minute for election to be resolved"
-sleep 65
-
-agops psm info --pair ${PSM_PAIR}
-
-# test mint limit was adjusted
-toyUSDGovernance="$(timeout 2 agoric follow -l :published.psm.${PSM_PAIR}.governance -o jsonlines)"
-test_val "$(echo "$toyUSDGovernance" | jq -r '.current.MintLimit.value.value')" "133337000000" "PSM MintLimit set correctly"
-
-
-test_val "$(agd q bank balances "$GOV1ADDR" --output=json --denom uist | jq -r .amount)" "250000" "pre-swap: validate IST"
-test_val "$(agd q bank balances "$GOV1ADDR" --output=json --denom ubld | jq -r .amount)" "190000000" "pre-swap: validate BLD balance"
-test_val "$(agd q bank balances "$GOV1ADDR" --output=json --denom ${USDC_DENOM} | jq -r .amount)" "100000000" "pre-swap: validate USDC balance"
-
-SWAP_OFFER=$(mktemp -t agops.XXX)
-agops psm swap --pair ${PSM_PAIR}  --wantMinted 10.00 --feePct 0.10 >|"$SWAP_OFFER"
-agops perf satisfaction --from $GOV1ADDR --executeOffer "$SWAP_OFFER" --keyring-backend=test
-
-test_val "$(agd q bank balances "$GOV1ADDR" --output=json --denom uist | jq -r .amount)" "10260011" "post-swap: validate IST"
-test_val "$(agd q bank balances "$GOV1ADDR" --output=json --denom ubld | jq -r .amount)" "190000000" "post-swap: validate BLD balance"
-test_val "$(agd q bank balances "$GOV1ADDR" --output=json --denom ${USDC_DENOM} | jq -r .amount)" "89989989" "post-swap: validate USDC balance"
-
-waitForBlock 3
-
-# dump provision pool metrics
-echo "Dumping provision pool metrics..."
-timeout 2 agoric follow -l :published.provisionPool.metrics -o jsonlines | tee /root/.agoric/provision_pool_metrics.json
-test_not_val "$(cat /root/.agoric/provision_pool_metrics.json | wc -l)" "0" "provision pool metrics shouldnt be empty"
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-8/pre_test.sh b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-8/pre_test.sh
deleted file mode 100644
index b0426340790..00000000000
--- a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-8/pre_test.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-. ./upgrade-test-scripts/env_setup.sh
-
-# ensure there's nothing in the provision pool
-test_val "$(agd q bank balances agoric1megzytg65cyrgzs6fvzxgrcqvwwl7ugpt62346 -o json | jq -r '.balances | length')" "0" "ensure nothing is in provisionpool"
-
-
-# Test no smart wallet for
-test_val "$(agd q vstorage data published.wallet.$GOV1ADDR -o json | jq -r .value)" "" "ensure gov1 not provisioned"
-test_val "$(agd q vstorage data published.wallet.$GOV2ADDR -o json | jq -r .value)" "" "ensure gov2 not provisioned"
-test_val "$(agd q vstorage data published.wallet.$GOV3ADDR -o json | jq -r .value)" "" "ensure gov3 not provisioned"
-
-waitForBlock 2
\ No newline at end of file
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-8/test.sh b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-8/test.sh
deleted file mode 100644
index cef9dfea76d..00000000000
--- a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-8/test.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-. ./upgrade-test-scripts/env_setup.sh
-
-# ensure there's only uist
-test_val "$(agd q bank balances agoric1megzytg65cyrgzs6fvzxgrcqvwwl7ugpt62346 -o json | jq -r '.balances | length')" "1"
-test_val "$(agd q bank balances agoric1megzytg65cyrgzs6fvzxgrcqvwwl7ugpt62346 -o json | jq -r '.balances[0].denom')" "uist"
-
-
-# test wallets are provisioned
-test_not_val "$(agd q vstorage data published.wallet.$GOV1ADDR -o json | jq -r .value)" "" "ensure gov1 provisioned"
-test_not_val "$(agd q vstorage data published.wallet.$GOV2ADDR -o json | jq -r .value)" "" "ensure gov2 provisioned"
-test_not_val "$(agd q vstorage data published.wallet.$GOV3ADDR -o json | jq -r .value)" "" "ensure gov3 provisioned"
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-9/.keep b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-9/.keep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-9/actions.sh b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-9/actions.sh
deleted file mode 100644
index e2ebf9394fb..00000000000
--- a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-9/actions.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-. ./upgrade-test-scripts/env_setup.sh
-
-# NOTE: agoric follow doesn't have the `-F` parameter in this version
-# so we use a hack
-
-# save somewhere we can access later
-echo "Dumping PSM gov params..."
-timeout 3 agoric follow -l :published.psm.${PSM_PAIR}.metrics -o jsonlines | tee /root/.agoric/psm_metrics.json
-timeout 3 agoric follow -l :published.psm.${PSM_PAIR}.governance -o jsonlines | tee /root/.agoric/psm_governance.json
-
-test_not_val "$(cat /root/.agoric/psm_metrics.json | wc -l)" "0" "psm metrics shouldnt be empty"
-test_not_val "$(cat /root/.agoric/psm_governance.json | wc -l)" "0" "psm gov params shouldnt be empty"
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-9/test.sh b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-9/test.sh
deleted file mode 100644
index 69420ab85ea..00000000000
--- a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-9/test.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-. ./upgrade-test-scripts/env_setup.sh
-# provision pool has right balance 
-test_val $(agd query bank balances agoric1megzytg65cyrgzs6fvzxgrcqvwwl7ugpt62346 -o json | jq -r '.balances | first | .amount') "19000000"
-
-# ensure PSM IST has only ToyUSD
-expnum=4
-if [[ "$BOOTSTRAP_MODE" == "test" ]]; then
-    expnum=1
-fi
-test_val $(agd q vstorage children published.psm.IST -o json | jq -r '.children | length') "$expnum"
-test_val $(agd q vstorage children published.psm.IST -o json | jq -r '.children | first') ${PSM_PAIR//IST./}
-
-# Gov params
-test_not_val "$(timeout 3 agoric follow -l :published.psm.${PSM_PAIR}.governance -o jsonlines | jq -r '.current.MintLimit.value.value')" "0" "PSM MintLimit non-zero"
-
-test_wallet_state "$USER1ADDR" old "user1 wallet is old"
-test_wallet_state "$GOV1ADDR" old "gov1 wallet is old"
-test_wallet_state "$GOV2ADDR" old "gov2 wallet is old"
-test_wallet_state "$GOV3ADDR" old "gov3 wallet is old"
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/cliHelper.js b/packages/deployment/upgrade-test/upgrade-test-scripts/cliHelper.js
index 4c3e0f4ba2e..8a89a19241a 100644
--- a/packages/deployment/upgrade-test/upgrade-test-scripts/cliHelper.js
+++ b/packages/deployment/upgrade-test/upgrade-test-scripts/cliHelper.js
@@ -1,6 +1,7 @@
 /* eslint-disable @jessie.js/safe-await-separator */
 import { $, execaCommand } from 'execa';
-import { BINARY } from './constants.js';
+
+const BINARY = 'agd';
 
 export const executeCommand = async (command, params, options = {}) => {
   const { stdout } = await execaCommand(
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/commonUpgradeHelpers.js b/packages/deployment/upgrade-test/upgrade-test-scripts/commonUpgradeHelpers.js
index dd631468113..2c7945d520a 100644
--- a/packages/deployment/upgrade-test/upgrade-test-scripts/commonUpgradeHelpers.js
+++ b/packages/deployment/upgrade-test/upgrade-test-scripts/commonUpgradeHelpers.js
@@ -177,16 +177,19 @@ export const voteLatestProposalAndWait = async () => {
     'test',
   );
 
-  let status = '';
-
-  do {
-    const proposalData = await agd.query('gov', 'proposal', lastProposalId);
-    status = proposalData.status;
-    console.log(`Waiting for proposal to pass (status=${status})`);
-  } while (
-    status !== 'PROPOSAL_STATUS_REJECTED' &&
-    status !== 'PROPOSAL_STATUS_PASSED'
-  );
+  let info = {};
+  for (
+    ;
+    info.status !== 'PROPOSAL_STATUS_REJECTED' &&
+    info.status !== 'PROPOSAL_STATUS_PASSED';
+    await waitForBlock()
+  ) {
+    info = await agd.query('gov', 'proposal', lastProposalId);
+    console.log(
+      `Waiting for proposal ${lastProposalId} to pass (status=${info.status})`,
+    );
+  }
+  return info;
 };
 
 const Fail = (template, ...args) => {
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/constants.js b/packages/deployment/upgrade-test/upgrade-test-scripts/constants.js
index ce9ef265f90..d5a7d1c3e8e 100644
--- a/packages/deployment/upgrade-test/upgrade-test-scripts/constants.js
+++ b/packages/deployment/upgrade-test/upgrade-test-scripts/constants.js
@@ -1,5 +1,3 @@
-export const BINARY = process.env.binary;
-
 export const GOV1ADDR = process.env.GOV1ADDR;
 export const GOV2ADDR = process.env.GOV2ADDR;
 export const GOV3ADDR = process.env.GOV3ADDR;
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/env_setup.sh b/packages/deployment/upgrade-test/upgrade-test-scripts/env_setup.sh
index feb055da6ec..5f1248f3c12 100755
--- a/packages/deployment/upgrade-test/upgrade-test-scripts/env_setup.sh
+++ b/packages/deployment/upgrade-test/upgrade-test-scripts/env_setup.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e # exit when any command fails
+
 echo ENV_SETUP starting
 
 # TODO what else should be in here?
@@ -13,46 +15,11 @@ if test -f "$HOME/.agoric/envs"; then
   source "$HOME/.agoric/envs"
 fi
 
-export binary=ag0
-if [ -x "$(command -v "agd")" ]; then
-  export binary=agd
-fi
-export GOV1ADDR=$($binary keys show gov1 -a --keyring-backend="test")
-export GOV2ADDR=$($binary keys show gov2 -a --keyring-backend="test")
-export GOV3ADDR=$($binary keys show gov3 -a --keyring-backend="test")
-export VALIDATORADDR=$($binary keys show validator -a --keyring-backend="test")
-export USER1ADDR=$($binary keys show user1 -a --keyring-backend="test")
-
-if [[ "$binary" == "agd" ]]; then
-# Support testnet addresses
-  sed -i "s/agoric1ldmtatp24qlllgxmrsjzcpe20fvlkp448zcuce/$GOV1ADDR/g" /usr/src/agoric-sdk/packages/vats/*.json
-  sed -i "s/agoric140dmkrz2e42ergjj7gyvejhzmjzurvqeq82ang/$GOV2ADDR/g" /usr/src/agoric-sdk/packages/vats/*.json
-  sed -i "s/agoric1w8wktaur4zf8qmmtn3n7x3r0jhsjkjntcm3u6h/$GOV3ADDR/g" /usr/src/agoric-sdk/packages/vats/*.json
-
-# Support mainnet addresses
-  sed -i "s/agoric1gx9uu7y6c90rqruhesae2t7c2vlw4uyyxlqxrx/$GOV1ADDR/g" /usr/src/agoric-sdk/packages/vats/*.json
-  sed -i "s/agoric1d4228cvelf8tj65f4h7n2td90sscavln2283h5/$GOV2ADDR/g" /usr/src/agoric-sdk/packages/vats/*.json
-  sed -i "s/agoric1zayxg4e9vd0es9c9jlpt36qtth255txjp6a8yc/$GOV3ADDR/g" /usr/src/agoric-sdk/packages/vats/*.json
-  sed -i '/agoric14543m33dr28x7qhwc558hzlj9szwhzwzpcmw6a/d' /usr/src/agoric-sdk/packages/vats/*.json
-  sed -i '/agoric13p9adwk0na5npfq64g22l6xucvqdmu3xqe70wq/d' /usr/src/agoric-sdk/packages/vats/*.json
-  sed -i '/agoric1el6zqs8ggctj5vwyukyk4fh50wcpdpwgugd5l5/d' /usr/src/agoric-sdk/packages/vats/*.json
-
-  # change names to gov1/2/3 since order is significant for invitation sending
-  sed -i "s/Jason Potts/gov1/g" /usr/src/agoric-sdk/packages/vats/*.json
-  sed -i "s/Chloe White/gov2/g" /usr/src/agoric-sdk/packages/vats/*.json
-  sed -i "s/Joe Clark/gov3/g" /usr/src/agoric-sdk/packages/vats/*.json
-
-# Oracle Addresses
-  sed -i "s/agoric1krunjcqfrf7la48zrvdfeeqtls5r00ep68mzkr/$GOV1ADDR/g" /usr/src/agoric-sdk/packages/vats/*.json
-  sed -i "s/agoric1n4fcxsnkxe4gj6e24naec99hzmc4pjfdccy5nj/$GOV2ADDR/g" /usr/src/agoric-sdk/packages/vats/*.json
-  sed -i '/agoric19uscwxdac6cf6z7d5e26e0jm0lgwstc47cpll8/d' /usr/src/agoric-sdk/packages/vats/*.json
-  sed -i '/agoric144rrhh4m09mh7aaffhm6xy223ym76gve2x7y78/d' /usr/src/agoric-sdk/packages/vats/*.json
-  sed -i '/agoric19d6gnr9fyp6hev4tlrg87zjrzsd5gzr5qlfq2p/d' /usr/src/agoric-sdk/packages/vats/*.json
-
-# committeeSize
-  sed -i 's/committeeSize": 6/committeeSize": 3/g' /usr/src/agoric-sdk/packages/vats/*.json
-  sed -i 's/minSubmissionCount": 3/minSubmissionCount": 1/g' /usr/src/agoric-sdk/packages/vats/*.json
-fi
+export GOV1ADDR=$(agd keys show gov1 -a --keyring-backend="test")
+export GOV2ADDR=$(agd keys show gov2 -a --keyring-backend="test")
+export GOV3ADDR=$(agd keys show gov3 -a --keyring-backend="test")
+export VALIDATORADDR=$(agd keys show validator -a --keyring-backend="test")
+export USER1ADDR=$(agd keys show user1 -a --keyring-backend="test")
 
 startAgd() {
   agd start --log_level warn "$@" &
@@ -193,15 +160,15 @@ test_wallet_state() {
 
 voteLatestProposalAndWait() {
   waitForBlock
-  proposal=$($binary q gov proposals -o json | jq -r '.proposals[-1].proposal_id')
+  proposal=$(agd q gov proposals -o json | jq -r '.proposals[-1].proposal_id')
   waitForBlock
-  $binary tx gov deposit $proposal 50000000ubld --from=validator --chain-id="$CHAINID" --yes --keyring-backend test
+  agd tx gov deposit $proposal 50000000ubld --from=validator --chain-id="$CHAINID" --yes --keyring-backend test
   waitForBlock
-  $binary tx gov vote $proposal yes --from=validator --chain-id="$CHAINID" --yes --keyring-backend test
+  agd tx gov vote $proposal yes --from=validator --chain-id="$CHAINID" --yes --keyring-backend test
   waitForBlock
 
   while true; do
-    status=$($binary q gov proposal $proposal -ojson | jq -r .status)
+    status=$(agd q gov proposal $proposal -ojson | jq -r .status)
     case $status in
     PROPOSAL_STATUS_PASSED)
       break
@@ -248,7 +215,7 @@ if [[ "$BOOTSTRAP_MODE" == "main" ]]; then
 fi
 
 # additional env specific to a version
-if test -f ./upgrade-test-scripts/$THIS_NAME/env_setup.sh; then
+if [[ -n "$THIS_NAME" ]] && test -f ./upgrade-test-scripts/$THIS_NAME/env_setup.sh; then
   echo ENV_SETUP found $THIS_NAME specific env, importing...
   . ./upgrade-test-scripts/$THIS_NAME/env_setup.sh
   echo ENV_SETUP imported $THIS_NAME specific env
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/propose-agoric-upgrade-11/.keep b/packages/deployment/upgrade-test/upgrade-test-scripts/propose-agoric-upgrade-11/.keep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/propose-agoric-upgrade-12/.keep b/packages/deployment/upgrade-test/upgrade-test-scripts/propose-agoric-upgrade-12/.keep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/start_ag0.sh b/packages/deployment/upgrade-test/upgrade-test-scripts/start_ag0.sh
deleted file mode 100644
index 4281ae92318..00000000000
--- a/packages/deployment/upgrade-test/upgrade-test-scripts/start_ag0.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/bash
-
-export CHAINID=agoriclocal
-ag0 init localnet --chain-id "$CHAINID"
-
-allaccounts=( "gov1" "gov2" "gov3" "user1" "validator" )
-for i in "${allaccounts[@]}"
-do
-  ag0 keys add $i --keyring-backend=test  2>&1 | tee "$HOME/.agoric/$i.out"
-  cat "$HOME/.agoric/$i.out" | tail -n1 | tee "$HOME/.agoric/$i.key"
-done
-
-. ./upgrade-test-scripts/env_setup.sh
-
-
-sed -i.bak "s/^timeout_commit =.*/timeout_commit = \"1s\"/" "$HOME/.agoric/config/config.toml"
-sed -i.bak "s/^enabled-unsafe-cors =.*/enabled-unsafe-cors = true/" "$HOME/.agoric/config/app.toml"
-sed -i.bak "s/^enable-unsafe-cors =.*/enable-unsafe-cors = true/" "$HOME/.agoric/config/app.toml"
-sed -i.bak "s/127.0.0.1:26657/0.0.0.0:26657/" "$HOME/.agoric/config/config.toml"
-sed -i.bak "s/cors_allowed_origins = \[\]/cors_allowed_origins = \[\"*\"\]/" "$HOME/.agoric/config/config.toml"
-sed -i.bak '/^\[api]/,/^\[/{s/^enable[[:space:]]*=.*/enable = true/}' "$HOME/.agoric/config/app.toml"
-
-
-contents="$(jq ".app_state.crisis.constant_fee.denom = \"ubld\"" "$HOME/.agoric/config/genesis.json")" && echo -E "${contents}" > "$HOME/.agoric/config/genesis.json"
-contents="$(jq ".app_state.mint.params.mint_denom = \"ubld\"" "$HOME/.agoric/config/genesis.json")" && echo -E "${contents}" > "$HOME/.agoric/config/genesis.json"
-contents="$(jq ".app_state.gov.deposit_params.min_deposit[0].denom = \"ubld\"" "$HOME/.agoric/config/genesis.json")" && echo -E "${contents}" > "$HOME/.agoric/config/genesis.json"
-contents="$(jq ".app_state.staking.params.bond_denom = \"ubld\"" "$HOME/.agoric/config/genesis.json")" && echo -E "${contents}" > "$HOME/.agoric/config/genesis.json"
-contents="$(jq ".app_state.slashing.params.signed_blocks_window = \"20000\"" "$HOME/.agoric/config/genesis.json")" && echo -E "${contents}" > "$HOME/.agoric/config/genesis.json"
-contents=$(jq '. * { app_state: { gov: { voting_params: { voting_period: "10s" } } } }' "$HOME/.agoric/config/genesis.json") && echo -E "${contents}" > "$HOME/.agoric/config/genesis.json"
-export GENACCT=$(ag0 keys show validator -a --keyring-backend="test")
-echo "Genesis Account $GENACCT"
-
-denoms=(
-"ibc/toyusdc" #test_usdc
-"ibc/06362C6F7F4FB702B94C13CD2E7C03DEC357683FD978936340B43FBFBC5351EB" #test_atom
-"ibc/BA313C4A19DFBF943586C0387E6B11286F9E416B4DD27574E6909CABE0E342FA" #main_ATOM
-"ibc/295548A78785A1007F232DE286149A6FF512F180AF5657780FC89C009E2C348F" #main_usdc_axl
-"ibc/6831292903487E58BF9A195FDDC8A2E626B3DF39B88F4E7F41C935CADBAF54AC" #main_usdc_grav
-"ibc/F2331645B9683116188EF36FC04A809C28BD36B54555E8705A37146D0182F045" #main_usdt_axl
-"ibc/386D09AE31DA7C0C93091BB45D08CB7A0730B1F697CD813F06A5446DCF02EEB2" #main_usdt_grv
-"ibc/3914BDEF46F429A26917E4D8D434620EC4817DC6B6E68FB327E190902F1E9242" #main_dai_axl
-"ibc/3D5291C23D776C3AA7A7ABB34C7B023193ECD2BC42EA19D3165B2CF9652117E7" #main_dai_grv
-"provisionpass" #for swingset provisioning
-)
-
-camount="1000000000000000000"
-coins="${camount}ubld"
-for i in "${denoms[@]}"; do
-  coins="${coins},${camount}${i}"
-done
-
-ag0 add-genesis-account "$GENACCT" "$coins"
-
-ag0 gentx validator 5000000000ubld --keyring-backend="test" --chain-id "$CHAINID" 
-ag0 collect-gentxs
-ag0 start --log_level warn &
-ag0_PID=$!
-wait_for_bootstrap
-waitForBlock 2
-
-voting_period_s=10
-latest_height=$(ag0 status | jq -r .SyncInfo.latest_block_height)
-height=$(( $latest_height + $voting_period_s + 10 ))
-if [[ "$BOOTSTRAP_MODE" == "test" ]]; then
-  UPGRADE_TO=${UPGRADE_TO//agoric-/agorictest-}
-fi
-
-info=${UPGRADE_INFO-"{}"}
-if echo "$info" | jq .; then :
-else
-  status=$?
-  echo "Upgrade info is not valid JSON: $info"
-  exit $status
-fi
-ag0 tx gov submit-proposal software-upgrade "$UPGRADE_TO" \
-  --upgrade-height="$height" --upgrade-info="$info" \
-  --title="Upgrade to ${UPGRADE_TO}" --description="upgrades" \
-  --from=validator --chain-id="$CHAINID" \
-  --yes --keyring-backend=test
-waitForBlock
-
-voteLatestProposalAndWait
-
-echo "Chain in to be upgraded state for $UPGRADE_TO"
-
-while true; do
-  latest_height=$(ag0 status | jq -r .SyncInfo.latest_block_height)
-  if [ "$latest_height" != "$height" ]; then
-    echo "Waiting for upgrade to happen (need $height, have $latest_height)"
-    sleep 1
-  else
-    echo "Upgrade height for $UPGRADE_TO reached. Killing ag0"
-    break
-  fi
-done
-
-kill $ag0_PID
-echo "state directory $HOME/.agoric ready for upgrade to $UPGRADE_TO"
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/start_to_to.sh b/packages/deployment/upgrade-test/upgrade-test-scripts/start_to_to.sh
index 2106129f4ac..75ed52d120c 100644
--- a/packages/deployment/upgrade-test/upgrade-test-scripts/start_to_to.sh
+++ b/packages/deployment/upgrade-test/upgrade-test-scripts/start_to_to.sh
@@ -9,17 +9,11 @@ export SLOGFILE=slog.slog
 
 startAgd
 
-if ! test -f "$HOME/.agoric/runActions-${THIS_NAME}"; then
-  if [[ "${USE_JS}" == "1" ]]; then
-    pushd upgrade-test-scripts
-    yarn upgrade-tests || exit 1
-    popd
-    runActions "legacy"
-  else
-    runActions "pre_test"
-    runActions "actions"
-    runActions "test"
-  fi
+if [[ -n "$THIS_NAME" ]] && ! test -f "$HOME/.agoric/runActions-${THIS_NAME}"; then
+  pushd upgrade-test-scripts || exit 1
+  yarn upgrade-tests || exit 1
+  popd || exit 1
+  runActions "legacy"
   
   touch "$HOME/.agoric/runActions-${THIS_NAME}"
 fi
@@ -27,7 +21,7 @@ fi
 if [[ "$DEST" != "1" ]]; then
   #Destined for an upgrade
   if [[ -z "${UPGRADE_TO}" ]]; then
-    echo "no upgrade set.  running for a few blocks and exiting"
+    echo "no UPGRADE_TO specified.  running for a few blocks and exiting"
     waitForBlock 5
     exit 0
   fi
@@ -56,7 +50,7 @@ if [[ "$DEST" != "1" ]]; then
 
   voteLatestProposalAndWait
 
-  echo "Chain in to be upgraded state for $UPGRADE_TO"
+  echo "Chain in to-be-upgraded state for $UPGRADE_TO"
 
   while true; do
     latest_height=$(agd status | jq -r .SyncInfo.latest_block_height)