diff --git a/.github/workflows/tests-all.yml b/.github/workflows/tests-all.yml
index ef44c43bc..026ff21f4 100644
--- a/.github/workflows/tests-all.yml
+++ b/.github/workflows/tests-all.yml
@@ -48,48 +48,10 @@ permissions:
   contents: read
 
 jobs:
-  run_basic_acceptance_tests:
-    runs-on: [all]
-    name: "Basic Acceptance Tests"
-    timeout-minutes: 45
-    steps:
-      - name: Remove test_data folder
-        run: |
-          sudo rm -rf test_data || true
-
-      - name: Checkout Repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          fetch-depth: 0
-          persist-credentials: false
-          ref: ${{ inputs.ref }}
-
-      - name: "Remove all Docker images"
-        if: ${{ github.event_name == 'push' || github.event.inputs.cleanup == 'true' }}
-        uses: ./.github/actions/cleanup
-        with:
-          system-prune: "true"
-
-      - name: "Run Setup"
-        uses: ./.github/actions/setup-env
-
-      - name: Run Basic Acceptance Tests
-        run: |
-          make clean-all
-          make run_basic_acceptance_tests
-
-      - name: Upload Logs and Reports
-        if: always() && (!contains(toJSON(inputs), 'save_artifacts') || inputs.save_artifacts)
-        uses: ./.github/actions/upload-artifacts
-
-      - name: Cleanup
-        if: always()
-        uses: ./.github/actions/cleanup
-
   run_functional_tests:
     runs-on: [all]
     name: "Functional Tests"
-    timeout-minutes: 55
+    timeout-minutes: 90
     steps:
       - name: Remove test_data folder
         run: |
diff --git a/tests/Makefile b/tests/Makefile
index 299576411..0bfc2ca9b 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -82,13 +82,11 @@ tests: \
   standard-tests \
 
 release-tests: \
-  additional-floor-plans \
   camera-deletion \
   different-formats-maps \
   live-view-button \
   non-functional-tests \
   scene-details \
-  randomly-failing-tests \
   reid-unique-count \
   reid-performance-degradation \
 
@@ -97,23 +95,16 @@ broken-features:
 
 # tests that are working, but feature is broken
 _broken-features: \
-  scene-import \
   calibrate-camera-3d-ui-2d-ui \
 
 broken-tests: \
   3d-ui-calibration-points \
-  distance-msoce \
   geospatial-ingest-publish \
   delete-sensor-mqtt-api \
   scenes-summary-api \
 
-randomly-failing-tests:
-	camera-status \
-	delete-sensor-scene \
-	persistence \
-	scenes-summary \
-	3d-scene-control-panel \
-	auto-calibration-ui \
+randomly-failing-tests: \
+  distance-msoce \
 
 # Not sorted alphabetically on purpose
 basic-acceptance-tests: \
@@ -138,13 +129,15 @@ basic-acceptance-tests-k8s: \
 standard-tests: \
   _functional-tests \
   _ui-tests \
-  show-telemetry-button \
-  upload-only-3d-glb-files \
 
 functional-tests:
 	$(MAKE) -Otarget _$@ SECRETSDIR=$(PWD)/manager/secrets SUPASS=$(SUPASS) BASE_IMAGE=$(BASE_IMAGE) -k
 
 _functional-tests: \
+  out-of-box \
+  out-of-box-no-ntp \
+  geometry-conformance \
+  auto-calibration-api \
   add-delete-3d-object-api \
   add-orphaned-cameras \
   api-large-strings \
@@ -156,11 +149,15 @@ _functional-tests: \
   delete-sensor-scene-api \
   delete-sensors-api \
   different-formats-maps-api \
+  reid-unique-count \
+  reid-performance-degradation \
   manual-camera-calibration-api \
   mqtt-auth \
   mqtt-cert \
+  mqtt-roi \
   mqtt-sensor-roi \
   mqtt-slow-sensor-roi \
+  mqtt-tripwire \
   object-crud-api \
   orphaned-sensor \
   persistence-api \
@@ -176,6 +173,7 @@ _functional-tests: \
   upload-3d-glb-file-api \
   upload-only-3d-glb-files-api \
   vdms-similarity-search \
+  3d-scene-control-panel \
 
 non-functional-tests:
 	$(MAKE) -Otarget _$@ SUPASS=$(SUPASS) -k
@@ -196,17 +194,29 @@ ui-tests:
 
 _ui-tests: \
   3d-camera-control-panel \
+  show-telemetry-button \
+  upload-only-3d-glb-files \
   add-delete-3d-object \
+  auto-calibration-ui \
   bounding-box \
   calibrate-all-sensor-types \
+  camera-deletion \
   camera-perspective \
   delete-roi-mqtt \
   delete-sensor-mqtt \
+  delete-sensor-scene \
   delete-sensors \
+  camera-status \
   delete-tripwire-mqtt \
+  different-formats-maps \
   manual-camera-calibration \
   object-crud \
   restricted-media-access \
+  persistence \
+  live-view-button \
+  scene-details \
+  scene-import \
+  scenes-summary \
   sensor-area \
   sensor-location \
   sensor-scene \
diff --git a/tests/Makefile.user_interface b/tests/Makefile.user_interface
index c00d6f67a..880565fcc 100644
--- a/tests/Makefile.user_interface
+++ b/tests/Makefile.user_interface
@@ -36,7 +36,10 @@ endef
 	$(eval SECRETSDIR := $(OLDSECRETSDIR))
 
 3d-scene-control-panel: # NEX-T10474
+	$(eval OLDSECRETSDIR := $(SECRETSDIR))
+	$(eval SECRETSDIR := $(PWD)/manager/secrets)
 	$(call selenium-recipe, $(COMPOSE)/dlstreamer/broker.yml:$(COMPOSE)/ntp.yml:$(COMPOSE)/pgserver.yml:$(COMPOSE)/scene.yml:$(COMPOSE)/web.yml, tests/ui/tc_scene_control_panel.py, 'pgserver')
+  $(eval SECRETSDIR := $(OLDSECRETSDIR))
 
 3d-ui-calibration-points: # NEX-T10473
 	$(eval OLDSECRETSDIR := $(SECRETSDIR))
@@ -164,7 +167,10 @@ scene-details: # NEX-T10395
 	$(call selenium-recipe, $(COMPOSE_FILES), tests/ui/tc_scene_details.py, '$(SERVICES)')
 
 scenes-summary: # NEX-T10394
+	$(eval OLDSECRETSDIR := $(SECRETSDIR))
+	$(eval SECRETSDIR := $(PWD)/manager/secrets)
 	$(call selenium-recipe, $(COMPOSE)/dlstreamer/broker.yml:$(COMPOSE)/pgserver.yml:$(COMPOSE)/web.yml, tests/ui/tc_scenes_summary.py, 'pgserver')
+	$(eval SECRETSDIR := $(OLDSECRETSDIR))
 
 sensor-area: # NEX-T10401
 	$(eval OLDSECRETSDIR := $(SECRETSDIR))