9 files changed, 3 insertions, 6 deletions
diff --git a/gui/e2e/tunnel-state.spec.ts b/gui/e2e/tunnel-state.spec.ts
index 3530f5712a..066dd5066e 100644
--- a/gui/e2e/tunnel-state.spec.ts
+++ b/gui/e2e/tunnel-state.spec.ts
@@ -64,7 +64,6 @@ test('App should show disconnected tunnel state', async () => {
   const buttonColor = await getBackgroundColor(button);
   expect(buttonColor).toBe(SECURE_COLOR);
 
-  await appWindow.waitForTimeout(2000);
   expect(await appWindow.screenshot()).toMatchSnapshot();
 });
 
@@ -95,7 +94,6 @@ test('App should show connecting tunnel state', async () => {
   const buttonColor = await getBackgroundColor(button);
   expect(buttonColor).toBe('rgba(227, 64, 57, 0.6)');
 
-  await appWindow.waitForTimeout(2000);
   expect(await appWindow.screenshot()).toMatchSnapshot();
 });
 
@@ -133,7 +131,6 @@ test('App should show connected tunnel state', async () => {
   const buttonColor = await getBackgroundColor(button);
   expect(buttonColor).toBe('rgba(255, 255, 255, 0.2)');
 
-  await appWindow.waitForTimeout(2000);
   expect(await appWindow.screenshot()).toMatchSnapshot();
 });
 
@@ -164,7 +161,6 @@ test('App should show disconnecting tunnel state', async () => {
   const buttonColor = await getBackgroundColor(button);
   expect(buttonColor).toBe(SECURE_COLOR);
 
-  await appWindow.waitForTimeout(2000);
   expect(await appWindow.screenshot()).toMatchSnapshot();
 });
 
diff --git a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connected-tunnel-state-1-darwin.png b/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connected-tunnel-state-1-darwin.png
index 4024c8674c..148d2461b7 100644
--- a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connected-tunnel-state-1-darwin.png
+++ b/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connected-tunnel-state-1-darwin.png
diff --git a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connecting-tunnel-state-1-darwin.png b/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connecting-tunnel-state-1-darwin.png
index d88f46dca1..bd3850e3b7 100644
--- a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connecting-tunnel-state-1-darwin.png
+++ b/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-connecting-tunnel-state-1-darwin.png
diff --git a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnected-tunnel-state-1-darwin.png b/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnected-tunnel-state-1-darwin.png
index 112dcf5b0a..b0a6d95aa4 100644
--- a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnected-tunnel-state-1-darwin.png
+++ b/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnected-tunnel-state-1-darwin.png
diff --git a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnecting-tunnel-state-1-darwin.png b/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnecting-tunnel-state-1-darwin.png
index f0bc568cd8..e0e8d694c8 100644
--- a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnecting-tunnel-state-1-darwin.png
+++ b/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-disconnecting-tunnel-state-1-darwin.png
diff --git a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-error-tunnel-state-1-darwin.png b/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-error-tunnel-state-1-darwin.png
index f8d7a3b5ec..a02d65b882 100644
--- a/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-error-tunnel-state-1-darwin.png
+++ b/gui/e2e/tunnel-state.spec.ts-snapshots/App-should-show-error-tunnel-state-1-darwin.png
diff --git a/gui/src/renderer/components/SvgMap.tsx b/gui/src/renderer/components/SvgMap.tsx
index 8b2c2deaf4..41fbb2697b 100644
--- a/gui/src/renderer/components/SvgMap.tsx
+++ b/gui/src/renderer/components/SvgMap.tsx
@@ -23,7 +23,7 @@ const provincesStatesLinesTree = rbush<IProvinceAndStateLineLeaf>().fromJSON(
 
 type BBox = [number, number, number, number];
 
-const MOVE_SPEED = 2000;
+const MOVE_SPEED = window.env.e2e ? 0 : 2000;
 
 const mapStyle = {
   width: '100%',
diff --git a/gui/src/renderer/preload.ts b/gui/src/renderer/preload.ts
index 8f37905ece..61b92a5962 100644
--- a/gui/src/renderer/preload.ts
+++ b/gui/src/renderer/preload.ts
@@ -5,6 +5,7 @@ import { IpcRendererEventChannel } from './lib/ipc-event-channel';
 contextBridge.exposeInMainWorld('ipc', IpcRendererEventChannel);
 
 contextBridge.exposeInMainWorld('env', {
+  e2e: process.env.CI,
   development: process.env.NODE_ENV === 'development',
   platform: process.platform,
 });
diff --git a/gui/types/global/index.d.ts b/gui/types/global/index.d.ts
index fe60baf4ca..72210cacc7 100644
--- a/gui/types/global/index.d.ts
+++ b/gui/types/global/index.d.ts
@@ -3,6 +3,6 @@ import { IpcRendererEventChannel } from '../../src/renderer/lib/ipc-event-channe
 declare global {
   interface Window {
     ipc: typeof IpcRendererEventChannel;
-    env: { platform: NodeJS.Platform; development: boolean };
+    env: { platform: NodeJS.Platform; development: boolean; e2e: boolean };
   }
 }