diff --git a/e2e/trade.spec.ts b/e2e/trade.spec.ts
index 2a497039..d585be1b 100644
--- a/e2e/trade.spec.ts
+++ b/e2e/trade.spec.ts
@@ -26,117 +26,120 @@ function tradeMocks(page) {
   });
 }
 
-test('Trade', async ({ page }) => {
-  await defaultMocks(page);
-  await setLoginInfo(page);
+test.describe('Trade', () => {
+  test.beforeEach(async ({ page }) => {
+    await defaultMocks(page);
+    await setLoginInfo(page);
 
-  await tradeMocks(page);
-  await page.goto('/trade');
+    await tradeMocks(page);
+    await page.goto('/trade');
+  });
+  test('Trade page', async ({ page }) => {
+    // Wait for network requests
+    // await page.waitForResponse('**/ping');
+    await page.waitForResponse('**/status');
+    await page.waitForResponse('**/profit');
+    await page.waitForResponse('**/balance');
+    // await page.waitForResponse('**/trades');
+    await page.waitForResponse('**/whitelist');
+    await page.waitForResponse('**/blacklist');
+    await page.waitForResponse('**/locks');
 
-  // Wait for network requests
-  // await page.waitForResponse('**/ping');
-  await page.waitForResponse('**/status');
-  await page.waitForResponse('**/profit');
-  await page.waitForResponse('**/balance');
-  // await page.waitForResponse('**/trades');
-  await page.waitForResponse('**/whitelist');
-  await page.waitForResponse('**/blacklist');
-  await page.waitForResponse('**/locks');
+    // // Check visibility of elements
+    await expect(page.locator('.drag-header', { hasText: 'Multi Pane' })).toBeInViewport();
+    await expect(page.locator('.drag-header:has-text("Chart")')).toBeInViewport();
+    // Pairlist elements
+    await expect(page.locator('button:has-text("BTC/USDT")')).toBeInViewport();
+    await expect(page.locator('button:has-text("ETH/USDT")')).toBeInViewport();
 
-  // // Check visibility of elements
-  await expect(page.locator('.drag-header', { hasText: 'Multi Pane' })).toBeInViewport();
-  await expect(page.locator('.drag-header:has-text("Chart")')).toBeInViewport();
-  // Pairlist elements
-  await expect(page.locator('button:has-text("BTC/USDT")')).toBeInViewport();
-  await expect(page.locator('button:has-text("ETH/USDT")')).toBeInViewport();
+    // // Click on Performance button and wait for response
+    await Promise.all([
+      page.waitForResponse('**/performance'),
+      page.click('button:has-text("Performance")'),
+    ]);
 
-  // // Click on Performance button and wait for response
-  await Promise.all([
-    page.waitForResponse('**/performance'),
-    page.click('button:has-text("Performance")'),
-  ]);
+    // // Check visibility of Profit USDT
+    await expect(page.locator('th:has-text("Profit USDT")')).toBeInViewport();
 
-  // // Check visibility of Profit USDT
-  await expect(page.locator('th:has-text("Profit USDT")')).toBeInViewport();
+    // // Test messageBox behavior
 
-  // // Test messageBox behavior
+    const dialogModal = page.getByRole('dialog');
+    const modalButton = page.locator(
+      '#MsgBoxModal .modal-dialog > .modal-content > .modal-footer > .btn-secondary:has-text("Cancel")',
+    );
+    await expect(dialogModal).not.toBeVisible();
+    await expect(dialogModal).not.toBeInViewport();
 
-  const dialogModal = page.getByRole('dialog');
-  const modalButton = page.locator(
-    '#MsgBoxModal .modal-dialog > .modal-content > .modal-footer > .btn-secondary:has-text("Cancel")',
-  );
-  await expect(dialogModal).not.toBeVisible();
-  await expect(dialogModal).not.toBeInViewport();
+    await expect(modalButton).not.toBeVisible();
 
-  await expect(modalButton).not.toBeVisible();
+    await page.getByRole('button', { name: 'Stop Trading - Also stops' }).click();
 
-  await page.getByRole('button', { name: 'Stop Trading - Also stops' }).click();
+    // Modal open
+    await expect(dialogModal).toBeVisible();
+    await expect(dialogModal).toBeInViewport();
+    await expect(modalButton).toBeInViewport();
 
-  // Modal open
-  await expect(dialogModal).toBeVisible();
-  await expect(dialogModal).toBeInViewport();
-  await expect(modalButton).toBeInViewport();
+    // // Close modal
+    await modalButton.click();
 
-  // // Close modal
-  await modalButton.click();
+    // // Modal closed
+    await expect(modalButton).not.toBeVisible();
+    await expect(modalButton).not.toBeInViewport();
 
-  // // Modal closed
-  await expect(modalButton).not.toBeVisible();
-  await expect(modalButton).not.toBeInViewport();
+    // // Click on General tab
+    const performancePair = page.locator('td:has-text("XRP/USDT")');
+    await expect(performancePair).toBeInViewport();
+    await page.click('button[role="tab"]:has-text("General")');
 
-  // // Click on General tab
-  const performancePair = page.locator('td:has-text("XRP/USDT")');
-  await expect(performancePair).toBeInViewport();
-  await page.click('button[role="tab"]:has-text("General")');
+    // // Check visibility of elements
+    await expect(performancePair).not.toBeInViewport();
+    const openTrades = page.locator('.drag-header:has-text("Open Trades")');
+    openTrades.scrollIntoViewIfNeeded();
+    await expect(openTrades).toBeInViewport();
+    const closedTrades = page.locator('.drag-header:has-text("Closed Trades")');
+    closedTrades.scrollIntoViewIfNeeded();
+    await expect(closedTrades).toBeInViewport();
+    await expect(page.locator('span:has-text("TRX/USDT")')).toBeInViewport();
+    await expect(page.locator('td:has-text("8070.5")')).toBeInViewport();
 
-  // // Check visibility of elements
-  await expect(performancePair).not.toBeInViewport();
-  const openTrades = page.locator('.drag-header:has-text("Open Trades")');
-  openTrades.scrollIntoViewIfNeeded();
-  await expect(openTrades).toBeInViewport();
-  const closedTrades = page.locator('.drag-header:has-text("Closed Trades")');
-  closedTrades.scrollIntoViewIfNeeded();
-  await expect(closedTrades).toBeInViewport();
-  await expect(page.locator('span:has-text("TRX/USDT")')).toBeInViewport();
-  await expect(page.locator('td:has-text("8070.5")')).toBeInViewport();
+    // Scroll to top
+    const multiPane = page.locator('.drag-header', { hasText: 'Multi Pane' });
+    await expect(multiPane).toBeVisible();
+    await multiPane.scrollIntoViewIfNeeded();
+    await expect(multiPane).toBeInViewport();
 
-  // Scroll to top
-  const multiPane = page.locator('.drag-header', { hasText: 'Multi Pane' });
-  await expect(multiPane).toBeVisible();
-  await multiPane.scrollIntoViewIfNeeded();
-  await expect(multiPane).toBeInViewport();
+    // // Click on Reload Config button
+    await page.getByRole('button', { name: 'Reload Config' }).click();
+    // await page.locator('button[title*="Reload Config "]').click();
+    await expect(dialogModal).toBeVisible();
+    await expect(dialogModal).toBeInViewport();
 
-  // // Click on Reload Config button
-  await page.getByRole('button', { name: 'Reload Config' }).click();
-  // await page.locator('button[title*="Reload Config "]').click();
-  await expect(dialogModal).toBeVisible();
-  await expect(dialogModal).toBeInViewport();
+    const modalOkButton = page.locator(
+      '#MsgBoxModal .modal-dialog > .modal-content > .modal-footer > .btn-primary:has-text("Ok")',
+    );
+    await expect(modalOkButton).toBeVisible();
+    await modalOkButton.click();
 
-  const modalOkButton = page.locator(
-    '#MsgBoxModal .modal-dialog > .modal-content > .modal-footer > .btn-primary:has-text("Ok")',
-  );
-  await expect(modalOkButton).toBeVisible();
-  await modalOkButton.click();
+    await expect(page.getByText('Config reloaded successfully.')).toBeInViewport();
 
-  await expect(page.getByText('Config reloaded successfully.')).toBeInViewport();
+    await page.locator('#avatar-drop').click();
 
-  await page.locator('#avatar-drop').click();
+    await page.getByLabel('Lock layout').uncheck();
 
-  await page.getByLabel('Lock layout').uncheck();
-
-  const chartHeader = await page.locator('.drag-header:has-text("Chart")');
-  await expect(multiPane).toBeInViewport();
-  await expect(chartHeader).toBeInViewport();
-
-  // Test drag and drop functionality
-  const chartHeaderbb = await chartHeader.boundingBox();
-  if (chartHeaderbb) {
-    await chartHeader.hover();
-    await page.mouse.down();
-
-    await page.mouse.move(chartHeaderbb?.x + chartHeaderbb.width / 2, chartHeaderbb?.y + 200);
-    await page.mouse.up();
+    const chartHeader = await page.locator('.drag-header:has-text("Chart")');
     await expect(multiPane).toBeInViewport();
     await expect(chartHeader).toBeInViewport();
-  }
+
+    // Test drag and drop functionality
+    const chartHeaderbb = await chartHeader.boundingBox();
+    if (chartHeaderbb) {
+      await chartHeader.hover();
+      await page.mouse.down();
+
+      await page.mouse.move(chartHeaderbb?.x + chartHeaderbb.width / 2, chartHeaderbb?.y + 200);
+      await page.mouse.up();
+      await expect(multiPane).toBeInViewport();
+      await expect(chartHeader).toBeInViewport();
+    }
+  });
 });