diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml
index afe2ee73896..36281990693 100644
--- a/src/amd/ci/gitlab-ci-inc.yml
+++ b/src/amd/ci/gitlab-ci-inc.yml
@@ -490,11 +490,6 @@
     INTEGRATED_OR_DISCRETE: discrete
     GPU_VERSION: radv-navi21
     FDO_CI_CONCURRENT: 32
-    # FIXME: drop everything below to use the same kernel as the rest of the amdgpu jobs
-    CI_TRON_KERNEL__URL: https://fs.mupuf.org/linux-6.6-b2c-radv-ci
-    CI_TRON_INITRAMFS__DEPMOD__URL: null
-    CI_TRON_INITRAMFS__GPU__URL: null
-    CI_TRON_INITRAMFS__GPU__FORMAT__0__ARCHIVE__KEEP__0__PATH: null
 
 .vangogh-test-valve:
   variables:
@@ -524,12 +519,6 @@
     INTEGRATED_OR_DISCRETE: discrete
     GPU_VERSION: radv-navi31
     FDO_CI_CONCURRENT: 32
-    # FIXME: drop everything below to use the same kernel as the rest of the amdgpu jobs
-    CI_TRON_KERNEL__URL: https://fs.mupuf.org/linux-6.6-b2c-radv-ci
-    CI_TRON_INITRAMFS__DEPMOD__URL: null
-    CI_TRON_INITRAMFS__GPU__URL: null
-    CI_TRON_INITRAMFS__GPU__FORMAT__0__ARCHIVE__KEEP__0__PATH: null
-
 
 .gfx1201-test-valve:
   variables:
diff --git a/src/amd/ci/radv-navi31-fails.txt b/src/amd/ci/radv-navi31-fails.txt
index 4cdf7cc28d6..fd9a7b6065e 100644
--- a/src/amd/ci/radv-navi31-fails.txt
+++ b/src/amd/ci/radv-navi31-fails.txt
@@ -9,18 +9,6 @@ dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_r
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.4_bit,Fail
 dEQP-VK.api.copy_and_blit.dedicated_allocation.resolve_image.whole_copy_before_resolving_transfer.8_bit,Fail
 
-# Video failures (these are fixed with up-to-date firmwares).
-dEQP-VK.video.synchronization.decode_av1.basic.event.device_set_reset,Fail
-dEQP-VK.video.synchronization.decode_h264.basic.event.device_set_reset,Fail
-dEQP-VK.video.synchronization.decode_h265.basic.event.device_set_reset,Fail
-dEQP-VK.video.synchronization.encode_h264.basic.event.device_set_reset,Fail
-dEQP-VK.video.synchronization.encode_h265.basic.event.device_set_reset,Fail
-dEQP-VK.video.synchronization2.decode_av1.basic.event.device_set_reset,Fail
-dEQP-VK.video.synchronization2.decode_h264.basic.event.device_set_reset,Fail
-dEQP-VK.video.synchronization2.decode_h265.basic.event.device_set_reset,Fail
-dEQP-VK.video.synchronization2.encode_h264.basic.event.device_set_reset,Fail
-dEQP-VK.video.synchronization2.encode_h265.basic.event.device_set_reset,Fail
-
 # CTS bug https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/6057
 dEQP-VK.image.host_image_copy.query.optimal.b8g8r8a8_sint,Fail
 dEQP-VK.image.host_image_copy.query.optimal.bc5_snorm_block,Fail