diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index c5802b5cb2c9c3..e0ade69e79239f 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -223,7 +223,6 @@ jobs:
       (github.event.pull_request.head.repo.full_name == 'commaai/openpilot'))
       && fromJSON('["namespace-profile-amd64-8x16", "namespace-experiments:docker.builds.local-cache=separate"]')
       || fromJSON('["ubuntu-24.04"]') }}
-    if: false  # FIXME: Started to timeout recently
     steps:
     - uses: actions/checkout@v4
       with:
@@ -234,11 +233,21 @@ jobs:
       run: |
         ${{ env.RUN }} "scons -j$(nproc)"
     - name: Driving test
-      timeout-minutes: ${{ (steps.setup-step.outputs.duration < 18) && 1 || 2 }}
+      timeout-minutes: 5
       run: |
-        ${{ env.RUN }} "source selfdrive/test/setup_xvfb.sh && \
+        mkdir -p simulation_logs
+        chmod -R 777 simulation_logs
+        ${{ env.RUN }} "export LOG_ROOT=/tmp/openpilot/simulation_logs && \
+                        export BLOCK=camerad,micd,logmessaged,ui && \
+                        source selfdrive/test/setup_xvfb.sh && \
                         source selfdrive/test/setup_vsound.sh && \
                         CI=1 pytest -s tools/sim/tests/test_metadrive_bridge.py"
+    - name: Upload simulation logs
+      if: always()
+      uses: actions/upload-artifact@v4
+      with:
+        name: simulation_logs
+        path: simulation_logs
 
   create_raylib_ui_report:
     name: Create raylib UI Report
diff --git a/tools/sim/launch_openpilot.sh b/tools/sim/launch_openpilot.sh
index fa5ac731bd3e8f..654855b8de6e27 100755
--- a/tools/sim/launch_openpilot.sh
+++ b/tools/sim/launch_openpilot.sh
@@ -6,10 +6,11 @@ export SIMULATION="1"
 export SKIP_FW_QUERY="1"
 export FINGERPRINT="HONDA_CIVIC_2022"
 
-export BLOCK="${BLOCK},camerad,loggerd,encoderd,micd,logmessaged"
-if [[ "$CI" ]]; then
-  # TODO: offscreen UI should work
-  export BLOCK="${BLOCK},ui"
+if [ -z "$BLOCK" ]; then
+  export BLOCK="camerad,loggerd,encoderd,micd,logmessaged"
+  if [[ "$CI" ]]; then
+    export BLOCK="${BLOCK},ui"
+  fi
 fi
 
 python3 -c "from openpilot.selfdrive.test.helpers import set_params_enabled; set_params_enabled()"
diff --git a/tools/sim/tests/test_metadrive_bridge.py b/tools/sim/tests/test_metadrive_bridge.py
index 04ce5d584f96b3..b353defe5261c5 100644
--- a/tools/sim/tests/test_metadrive_bridge.py
+++ b/tools/sim/tests/test_metadrive_bridge.py
@@ -12,7 +12,7 @@
 class TestMetaDriveBridge(TestSimBridgeBase):
   @pytest.fixture(autouse=True)
   def setup_create_bridge(self, test_duration):
-    self.test_duration = 30
+    self.test_duration = test_duration
 
   def create_bridge(self):
     return MetaDriveBridge(False, False, self.test_duration, True)