diff --git a/api/package.json b/api/package.json
index 0782ac0cd..822f01871 100644
--- a/api/package.json
+++ b/api/package.json
@@ -18,9 +18,9 @@
     "tsc": "tsc --noEmit",
     "lint": "eslint --flag unstable_ts_config --config .eslintrc.ts src/",
     "lint:fix": "eslint --flag unstable_ts_config --fix --config .eslintrc.ts src/",
-    "test:watch": "DOTENV_CONFIG_PATH=./.env.test NODE_ENV=test vitest --pool=forks",
-    "test": "DOTENV_CONFIG_PATH=./.env.test NODE_ENV=test vitest run --pool=forks",
-    "coverage": "DOTENV_CONFIG_PATH=./.env.test NODE_ENV=test vitest run --coverage",
+    "test:watch": "vitest --pool=forks",
+    "test": "vitest run --pool=forks",
+    "coverage": "vitest run --pool=forks --coverage",
     "release": "standard-version",
     "dev": "vite",
     "container:build": "./scripts/dc.sh build dev",
diff --git a/api/src/__test__/setup/env-setup.ts b/api/src/__test__/setup/env-setup.ts
new file mode 100644
index 000000000..5502dc210
--- /dev/null
+++ b/api/src/__test__/setup/env-setup.ts
@@ -0,0 +1,6 @@
+import { config } from 'dotenv';
+config({
+    path: './.env.test',
+    debug: false,
+    encoding: 'utf-8',
+})
\ No newline at end of file
diff --git a/api/src/consts.ts b/api/src/consts.ts
index da874566b..fdd563269 100644
--- a/api/src/consts.ts
+++ b/api/src/consts.ts
@@ -48,7 +48,6 @@ export const KEEP_ALIVE_INTERVAL_MS = THREE_MINUTES_MS; // This is set to 45 sec
  * Graphql link.
  */
 
-
 export const JWKS_LOCAL_PAYLOAD: JSONWebKeySet = {
     keys: [
         {
diff --git a/api/src/graphql/generated/client/gql.ts b/api/src/graphql/generated/client/gql.ts
index 7ff96c0d5..b6b97e517 100644
--- a/api/src/graphql/generated/client/gql.ts
+++ b/api/src/graphql/generated/client/gql.ts
@@ -1,4 +1,3 @@
-/* eslint-disable */
 import * as types from './graphql.js';
 import type { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/core';
 
diff --git a/api/src/graphql/generated/client/validators.ts b/api/src/graphql/generated/client/validators.ts
index 4bb0c65ba..c38bc5588 100644
--- a/api/src/graphql/generated/client/validators.ts
+++ b/api/src/graphql/generated/client/validators.ts
@@ -1,4 +1,3 @@
-/* eslint-disable */
 import { z } from 'zod'
 import { AccessUrlInput, ArrayCapacityBytesInput, ArrayCapacityInput, ClientType, ConfigErrorState, DashboardAppsInput, DashboardArrayInput, DashboardCaseInput, DashboardConfigInput, DashboardDisplayInput, DashboardInput, DashboardOsInput, DashboardServiceInput, DashboardServiceUptimeInput, DashboardTwoFactorInput, DashboardTwoFactorLocalInput, DashboardTwoFactorRemoteInput, DashboardVarsInput, DashboardVersionsInput, DashboardVmsInput, EventType, Importance, NetworkInput, NotificationInput, NotificationStatus, PingEventSource, RegistrationState, RemoteAccessEventActionType, RemoteAccessInput, RemoteGraphQLClientInput, RemoteGraphQLEventType, RemoteGraphQLServerInput, ServerStatus, URL_TYPE, UpdateType } from '@app/graphql/generated/client/graphql'
 
diff --git a/api/vite.config.ts b/api/vite.config.ts
index bd364a71b..38969c791 100644
--- a/api/vite.config.ts
+++ b/api/vite.config.ts
@@ -66,8 +66,11 @@ export default defineConfig(({ mode }) => {
                 reporter: ['text', 'json', 'html'],
             },
             clearMocks: true,
-            setupFiles: ['src/__test__/setup/keyserver-mock.ts', 'dotenv/config'],
+            setupFiles: ['src/__test__/setup/env-setup.ts', 'src/__test__/setup/keyserver-mock.ts',],
             exclude: ['deploy/', 'node_modules/'],
+            env: {
+                NODE_ENV: 'test',
+            }
         },
     };
 });