diff --git a/server/src/db/config/database.js b/server/src/db/config/database.js
index c3ce5402..f8d77160 100644
--- a/server/src/db/config/database.js
+++ b/server/src/db/config/database.js
@@ -1,5 +1,15 @@
 require('dotenv').config({ path: './.env' });
 
+// Validate required environment variables
+const requiredEnvVars = ['DB_USER', 'DB_PASSWORD', 'DB_NAME', 'DB_HOST', 'DB_PORT'];
+requiredEnvVars.forEach(envVar => {
+  if (!process.env[envVar]) {
+    console.error(`Error: Environment variable ${envVar} is not set.`);
+    process.exit(1);
+  }
+});
+
+
 module.exports = {
   development: {
     username: process.env.DB_USER,
@@ -13,7 +23,7 @@ module.exports = {
   test: {
     username: process.env.DB_USER,
     password: process.env.DB_PASSWORD,
-    database: process.env.TEST_DB_NAME,
+    database: process.env.DB_NAME,
     host: process.env.DB_HOST,
     port: process.env.DB_PORT,
     dialect: 'postgres',