diff --git a/.github/workflow-templates/dev-tests/action.yml b/.github/workflow-templates/dev-tests/action.yml
index 4ccc6afbefb..1a57a4d1ac8 100644
--- a/.github/workflow-templates/dev-tests/action.yml
+++ b/.github/workflow-templates/dev-tests/action.yml
@@ -46,6 +46,7 @@ runs:
         chmod uog+x target/release/moonbeam
         cd test
         bun install
+        bun compile-solidity compile
         bun moonwall test ${{ inputs.moonwall_environment }}
     - name: Upload HTML report
       if: always()
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 22f6fd588ff..e97a97c081a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -514,7 +514,7 @@ jobs:
         run: |
           cd test
           bun install
-          bun moonwall test CI_upgrade_RT_${{matrix.chain}}
+          pnpm moonwall test CI_upgrade_RT_${{matrix.chain}}
 
   zombie_upgrade_test:
     runs-on:
diff --git a/test/bun.lockb b/test/bun.lockb
index c26f1eccc8c..83ed97cd2d2 100755
Binary files a/test/bun.lockb and b/test/bun.lockb differ
diff --git a/test/suites/para/test_moonbase.ts b/test/suites/para/test_moonbase.ts
index 1d56196764e..1057f279e97 100644
--- a/test/suites/para/test_moonbase.ts
+++ b/test/suites/para/test_moonbase.ts
@@ -14,9 +14,8 @@ describeSuite({
     let relayApi: ApiPromise;
 
     beforeAll(async () => {
-      paraApi = context.polkadotJs({ apiName: "parachain", type: "moon" });
-      relayApi = context.polkadotJs({ apiName: "relaychain", type: "polkadotJs" });
-      ethersSigner = context.ethers();
+      paraApi = context.polkadotJs("parachain");
+      relayApi = context.polkadotJs("relaychain");
 
       const relayNetwork = relayApi.consts.system.version.specName.toString();
       expect(relayNetwork, "Relay API incorrect").to.contain("rococo");
@@ -107,15 +106,15 @@ describeSuite({
       title: "Tags are present on emulated Ethereum blocks",
       test: async function () {
         expect(
-          (await ethersSigner.provider!.getBlock("safe"))!.number,
+          (await context.ethers().provider!.getBlock("safe"))!.number,
           "Safe tag is not present"
         ).to.be.greaterThan(0);
         expect(
-          (await ethersSigner.provider!.getBlock("finalized"))!.number,
+          (await context.ethers().provider!.getBlock("finalized"))!.number,
           "Finalized tag is not present"
         ).to.be.greaterThan(0);
         expect(
-          (await ethersSigner.provider!.getBlock("latest"))!.number,
+          (await context.ethers().provider!.getBlock("latest"))!.number,
           "Latest tag is not present"
         ).to.be.greaterThan(0);
         // log(await ethersSigner.provider.getTransactionCount(ALITH_ADDRESS, "latest"));
diff --git a/test/suites/para/test_moonbeam.ts b/test/suites/para/test_moonbeam.ts
index 93e44421a9f..9d5c83f3163 100644
--- a/test/suites/para/test_moonbeam.ts
+++ b/test/suites/para/test_moonbeam.ts
@@ -15,8 +15,8 @@ describeSuite({
     let ethersSigner: Signer;
 
     beforeAll(async () => {
-      paraApi = context.polkadotJs({ apiName: "parachain", type: "moon" });
-      relayApi = context.polkadotJs({ apiName: "relaychain", type: "polkadotJs" });
+      paraApi = context.polkadotJs("parachain");
+      relayApi = context.polkadotJs("relaychain");
       ethersSigner = context.ethers()!;
 
       const relayNetwork = relayApi.consts.system.version.specName.toString();