diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3fc6d0..abddf5d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,24 +10,41 @@ stages:
   - setup
   - test
 
+# -------- SETUP STAGE --------
 setup_environment:
   stage: setup
   script:
+    - echo "🔧 Setting up environment..."
     - pip install --upgrade pip
     - pip install -r requirements.txt
-    - echo "Dependencies installed successfully."
+    - echo "✅ Dependencies installed successfully."
 
   only:
     - main
-    - feature/ci-pipeline-s1-09a-1  # You can add more branches if needed
+    - feature/ci-pipeline-s1-09a-1  # Add more branches if needed
 
+# -------- TEST APP FOLDER --------
 test_app:
   stage: test
   script:
-    - echo "Running V2D Framework basic test..."
-    - python -m unittest discover
+    - echo "🧪 Running tests in app folder..."
+    - python -m unittest discover app || echo "⚠️ No tests found in app folder."
+    - echo "✅ App folder test completed successfully."
 
   only:
     - main
     - feature/ci-pipeline-s1-09a-1
 
+# -------- TEST TEST FOLDER --------
+test_test_folder:
+  stage: test
+  script:
+    - echo "🧪 Running tests in test folder..."
+    - python -m unittest discover test || echo "⚠️ No tests found in test folder."
+    - echo "✅ Test folder test completed successfully."
+
+  only:
+    - main
+    - feature/ci-pipeline-s1-09a-1
+
+