diff --git a/tests/zephyr/drivers/timer/nrf_grtc_timer/prj.conf b/tests/zephyr/drivers/timer/nrf_grtc_timer/prj.conf
index dea03477519d..90b4e5f2d191 100644
--- a/tests/zephyr/drivers/timer/nrf_grtc_timer/prj.conf
+++ b/tests/zephyr/drivers/timer/nrf_grtc_timer/prj.conf
@@ -1,2 +1,5 @@
 CONFIG_ZTEST=y
 CONFIG_NRF_GRTC_TIMER=y
+CONFIG_COUNTER=y
+CONFIG_TEST_RANDOM_GENERATOR=y
+CONFIG_XOSHIRO_RANDOM_GENERATOR=y
diff --git a/tests/zephyr/drivers/timer/nrf_grtc_timer/testcase.yaml b/tests/zephyr/drivers/timer/nrf_grtc_timer/testcase.yaml
index 5c9fb6362f8d..9bc1b9443875 100644
--- a/tests/zephyr/drivers/timer/nrf_grtc_timer/testcase.yaml
+++ b/tests/zephyr/drivers/timer/nrf_grtc_timer/testcase.yaml
@@ -1,24 +1,28 @@
+common:
+  tags:
+    - drivers
+    - ci_tests_zephyr_drivers_timer
+  platform_allow:
+    - nrf54lm20pdk/nrf54lm20a/cpuapp
+    - nrf54lm20pdk/nrf54lm20a/cpuflpr
+    - nrf54lm20pdk@0.0.0/nrf54lm20a/cpuapp
+    - nrf54lm20pdk@0.0.0/nrf54lm20a/cpuflpr
+    - nrf54lm20pdk@0.2.0/nrf54lm20a/cpuapp
+    - nrf54lm20pdk@0.2.0/nrf54lm20a/cpuflpr
+    - nrf54lm20pdk@0.2.0.csp/nrf54lm20a/cpuapp
+    - nrf54lm20pdk@0.2.0.csp/nrf54lm20a/cpuflpr
+    - nrf54lv10dk/nrf54lv10a/cpuapp
+    - nrf54lv10dk@0.0.0/nrf54lv10a/cpuapp
+    - nrf54lv10dk@0.2.0/nrf54lv10a/cpuapp
+    - nrf54lv10dk/nrf54lv10a/cpuflpr
+    - nrf54lv10dk@0.0.0/nrf54lv10a/cpuflpr
+    - nrf54lv10dk@0.2.0/nrf54lv10a/cpuflpr
+  integration_platforms:
+    - nrf54lm20pdk/nrf54lm20a/cpuapp
+    - nrf54lv10dk/nrf54lv10a/cpuapp
+  timeout: 45
 tests:
-  nrf.extended.drivers.timer.nrf_grtc_timer:
-    tags:
-      - drivers
-      - ci_tests_zephyr_drivers_timer
-    platform_allow:
-      - nrf54lm20pdk/nrf54lm20a/cpuapp
-      - nrf54lm20pdk/nrf54lm20a/cpuflpr
-      - nrf54lm20pdk@0.0.0/nrf54lm20a/cpuapp
-      - nrf54lm20pdk@0.0.0/nrf54lm20a/cpuflpr
-      - nrf54lm20pdk@0.2.0/nrf54lm20a/cpuapp
-      - nrf54lm20pdk@0.2.0/nrf54lm20a/cpuflpr
-      - nrf54lm20pdk@0.2.0.csp/nrf54lm20a/cpuapp
-      - nrf54lm20pdk@0.2.0.csp/nrf54lm20a/cpuflpr
-      - nrf54lv10dk/nrf54lv10a/cpuapp
-      - nrf54lv10dk@0.0.0/nrf54lv10a/cpuapp
-      - nrf54lv10dk@0.2.0/nrf54lv10a/cpuapp
-      - nrf54lv10dk/nrf54lv10a/cpuflpr
-      - nrf54lv10dk@0.0.0/nrf54lv10a/cpuflpr
-      - nrf54lv10dk@0.2.0/nrf54lv10a/cpuflpr
-    integration_platforms:
-      - nrf54lm20pdk/nrf54lm20a/cpuapp
-      - nrf54lv10dk/nrf54lv10a/cpuapp
-    timeout: 30
+  nrf.extended.drivers.timer.nrf_grtc_timer: {}
+  nrf.extended.drivers.timer.nrf_grtc_timer.no_assert:
+    extra_configs:
+      - CONFIG_ASSERT=n
diff --git a/west.yml b/west.yml
index 4849c2867e4f..691168976d0e 100644
--- a/west.yml
+++ b/west.yml
@@ -65,7 +65,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: 231cc2964814da82c866ec9c61d8e59097d43591
+      revision: 8af4f9f53d90c24ce275dc364aa035eb544a155e
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above