diff --git a/contracts/hardhat.config.ts b/contracts/hardhat.config.ts
index 67427a34..fd95dc01 100644
--- a/contracts/hardhat.config.ts
+++ b/contracts/hardhat.config.ts
@@ -64,7 +64,7 @@ const config: HardhatUserConfig = {
       chainId: 0x5aff,
       accounts: process.env.SAPPHIRE_TESTNET_PRIVATE_KEY
         ? [process.env.SAPPHIRE_TESTNET_PRIVATE_KEY]
-        : TEST_HDWALLET,
+        : [],
     },
     'sapphire-mainnet': {
       url: 'https://sapphire.oasis.io',
diff --git a/contracts/test/semantics.ts b/contracts/test/semantics.ts
index bead64b5..49a7817d 100644
--- a/contracts/test/semantics.ts
+++ b/contracts/test/semantics.ts
@@ -22,13 +22,11 @@ describe('EVM Semantics', () => {
   });
 
   it('eth_call maximum return length vs gas limit', async () => {
-    if (chainId != 31337) {
-      const i = 1787872;
-      const respHex = await c.testViewLength(i);
-      const respBytes = ethers.utils.arrayify(respHex);
-      expect(respBytes.length).eq(i);
-      expect(c.testViewLength(i + 1)).reverted;
-    }
+    const i = 1787872;
+    const respHex = await c.testViewLength(i);
+    const respBytes = ethers.utils.arrayify(respHex);
+    expect(respBytes.length).eq(i);
+    expect(c.testViewLength(i + 1)).reverted;
   });
 
   it('Error string in view call', async () => {