diff --git a/apps/trading-e2e/cypress.config.js b/apps/trading-e2e/cypress.config.js
index 763d95ab5..5f46b6d03 100644
--- a/apps/trading-e2e/cypress.config.js
+++ b/apps/trading-e2e/cypress.config.js
@@ -29,6 +29,7 @@ module.exports = defineConfig({
     defaultCommandTimeout: 10000,
     viewportWidth: 1440,
     viewportHeight: 900,
+    responseTimeout: 10000,
   },
   env: {
     TRADING_TEST_VEGA_WALLET_NAME: 'UI_Trading_Test',
diff --git a/apps/trading-e2e/src/integration/markets.cy.ts b/apps/trading-e2e/src/integration/markets.cy.ts
index ec563a21b..a7b34b968 100644
--- a/apps/trading-e2e/src/integration/markets.cy.ts
+++ b/apps/trading-e2e/src/integration/markets.cy.ts
@@ -9,11 +9,11 @@ describe('markets table', () => {
       mockTradingPage(req, MarketState.STATE_ACTIVE);
       aliasQuery(req, 'MarketList', generateMarketList());
     });
-    cy.visit('/');
-    cy.wait('@MarketList', { timeout: 5000 });
   });
 
   it('renders markets correctly', () => {
+    cy.visit('/');
+    cy.wait('@MarketList');
     cy.get('[data-testid^="market-link-"]')
       .should('not.be.empty')
       .and('have.attr', 'href');
@@ -25,6 +25,8 @@ describe('markets table', () => {
   });
 
   it('renders market list drop down', () => {
+    cy.visit('/');
+    cy.wait('@MarketList');
     openMarketDropDown();
     cy.getByTestId('price').invoke('text').should('not.be.empty');
     cy.getByTestId('trading-mode').should('not.be.empty');
@@ -34,6 +36,8 @@ describe('markets table', () => {
   });
 
   it('Able to select market from dropdown', () => {
+    cy.visit('/');
+    cy.wait('@MarketList');
     openMarketDropDown();
     cy.getByTestId('market-link-market-0').should('be.visible').click();
 
@@ -43,6 +47,22 @@ describe('markets table', () => {
     verifyMarketSummaryDisplayed();
   });
 
+  it('Settlement expiry is displayed', () => {
+    cy.visit('/markets/market-0');
+    cy.wait('@Market');
+
+    cy.getByTestId('trading-expiry')
+      .should('have.text', 'Not time-based')
+      .realHover();
+    cy.getByTestId('expiry-tool-tip').should(
+      'contain.text',
+      'This market expires when triggered by its oracle, not on a set date.'
+    );
+    cy.getByTestId('link')
+      .should('have.attr', 'href')
+      .and('include', 'https://explorer.fairground.wtf/');
+  });
+
   it('Auction conditions are displayed', () => {
     const toolTipLabel = 'tooltip-label';
     const toolTipValue = 'tooltip-value';
@@ -55,10 +75,6 @@ describe('markets table', () => {
       'Est uncrossing vol',
     ];
 
-    cy.mockGQL((req) => {
-      mockTradingPage(req, MarketState.STATE_ACTIVE);
-    });
-
     cy.visit('/markets/market-0');
     cy.wait('@Market');
 
diff --git a/apps/trading-e2e/src/integration/trading-deal-ticket.cy.ts b/apps/trading-e2e/src/integration/trading-deal-ticket.cy.ts
index 575ce81ab..da01d9990 100644
--- a/apps/trading-e2e/src/integration/trading-deal-ticket.cy.ts
+++ b/apps/trading-e2e/src/integration/trading-deal-ticket.cy.ts
@@ -33,6 +33,7 @@ describe('deal ticket orders', () => {
       mockTradingPage(req, MarketState.STATE_ACTIVE);
     });
     cy.visit('/markets/market-0');
+    cy.wait('@Market');
     connectVegaWallet();
   });
 
diff --git a/apps/trading-e2e/src/support/mocks/generate-deal-ticket-query.ts b/apps/trading-e2e/src/support/mocks/generate-deal-ticket-query.ts
index f2e3f0464..55c162232 100644
--- a/apps/trading-e2e/src/support/mocks/generate-deal-ticket-query.ts
+++ b/apps/trading-e2e/src/support/mocks/generate-deal-ticket-query.ts
@@ -11,7 +11,7 @@ export const generateDealTicketQuery = (
       __typename: 'Market',
       id: 'market-0',
       name: 'ETHBTC Quarterly (30 Jun 2022)',
-      decimalPlaces: 2,
+      decimalPlaces: 5,
       positionDecimalPlaces: 0,
       state: MarketState.STATE_ACTIVE,
       tradingMode: MarketTradingMode.TRADING_MODE_CONTINUOUS,
diff --git a/apps/trading/pages/markets/trade-grid.tsx b/apps/trading/pages/markets/trade-grid.tsx
index 04a552828..07a794310 100644
--- a/apps/trading/pages/markets/trade-grid.tsx
+++ b/apps/trading/pages/markets/trade-grid.tsx
@@ -92,7 +92,7 @@ const ExpiryTooltipContent = ({
 
     return (
       <>
-        <p className="mb-2">
+        <p data-testid="expiry-tool-tip" className="mb-2">
           {t(
             'This market expires when triggered by its oracle, not on a set date.'
           )}