diff --git a/test/factories/BlockchainFactory.test.ts b/test/factories/BlockchainFactory.test.ts
index 1a56af07..e55bfc97 100644
--- a/test/factories/BlockchainFactory.test.ts
+++ b/test/factories/BlockchainFactory.test.ts
@@ -6,12 +6,18 @@ import settings from '../../src/config/settings';
 
 describe('BlockchainFactory', () => {
   describe('#create', () => {
-    describe('Given a foreign chainId for an evm blockchain', async () => {
+    describe('Given a foreign chainId for an evm blockchain (optional)', async () => {
       ForeignChainsIds.filter((x) => !NonEvmChainsIds.includes(x)).forEach((chainId) => {
         it('should return a Blockchain instance', async () => {
-          const blockchain = BlockchainFactory.create({ chainId, settings });
-          expect(!!blockchain).to.eql(true);
-          expect(blockchain.chainId).to.eql(chainId);
+          try {
+            const blockchain = BlockchainFactory.create({chainId, settings});
+            expect(!!blockchain).to.eql(true);
+            expect(blockchain.chainId).to.eql(chainId);
+          } catch (e) {
+            if (e.message.includes('could not detect network')) {
+              console.error(e.message);
+            } throw e;
+          }
         });
       });
     });
diff --git a/test/repositories/ChainContractRepository.test.ts b/test/repositories/ChainContractRepository.test.ts
index 416640e1..187e238f 100644
--- a/test/repositories/ChainContractRepository.test.ts
+++ b/test/repositories/ChainContractRepository.test.ts
@@ -2,7 +2,7 @@ import 'reflect-metadata';
 import { expect } from 'chai';
 import { ChainContractRepository } from '../../src/repositories/ChainContractRepository';
 import { BlockchainRepository } from '../../src/repositories/BlockchainRepository';
-import { ChainsIds, ForeignChainsIds, NonEvmChainsIds } from '../../src/types/ChainsIds';
+import { ForeignChainsIds, NonEvmChainsIds } from '../../src/types/ChainsIds';
 
 import { getTestContainer } from '../helpers/getTestContainer';
 
@@ -17,16 +17,21 @@ describe('ChainContractRepository', () => {
   });
 
   describe('#get', () => {
-    describe('Given a foreign chainId for an evm blockchain', async () => {
+    describe('Given a foreign chainId for an evm blockchain (optional)', async () => {
       ForeignChainsIds.filter((x) => !NonEvmChainsIds.includes(x))
-        .filter((x) => x !== ChainsIds.ARBITRUM) // TODO enable when we move to goerli
         .forEach((chainId) => {
           it(`should return a ForeignChainContract instance for ${chainId}`, async () => {
-            const foreignChainContract = chainContractRepository.get(chainId);
-            expect(foreignChainContract).to.not.empty;
+            try {
+              const foreignChainContract = chainContractRepository.get(chainId);
+              expect(foreignChainContract).to.not.empty;
 
-            await foreignChainContract.resolveContract();
-            expect(foreignChainContract.address()).to.not.empty;
+              await foreignChainContract.resolveContract();
+              expect(foreignChainContract.address()).to.not.empty;
+            } catch (e) {
+              if (e.message.includes('could not detect network')) {
+                console.error(e.message);
+              } throw e;
+            }
           });
         });
     });