diff --git a/bsps/aarch64/shared/cache/cache.c b/bsps/aarch64/shared/cache/cache.c
index be459d5083..0a738960ba 100644
--- a/bsps/aarch64/shared/cache/cache.c
+++ b/bsps/aarch64/shared/cache/cache.c
@@ -335,18 +335,9 @@ static inline void _CPU_cache_enable_data(void)
   rtems_interrupt_local_enable(level);
 }
 
-static inline void _CPU_cache_disable_data(void)
+static RTEMS_NO_RETURN inline void _CPU_cache_disable_data(void)
 {
-  rtems_interrupt_level level;
-  uint64_t sctlr;
-
-  rtems_interrupt_local_disable(level);
-  AArch64_data_cache_clean_all_levels();
-  AArch64_data_cache_invalidate_all_levels();
-  sctlr = _AArch64_Read_sctlr_el1();
-  sctlr &= ~AARCH64_SCTLR_EL1_C;
-  _AArch64_Write_sctlr_el1(sctlr);
-  rtems_interrupt_local_enable(level);
+  _Internal_error( INTERNAL_ERROR_CANNOT_DISABLE_DATA_CACHE );
 }
 
 #ifdef RTEMS_SMP
diff --git a/spec/build/testsuites/validation/objcachedisabledata.yml b/spec/build/testsuites/validation/objcachedisabledata.yml
index e02a415496..b6cacba383 100644
--- a/spec/build/testsuites/validation/objcachedisabledata.yml
+++ b/spec/build/testsuites/validation/objcachedisabledata.yml
@@ -6,7 +6,9 @@ copyrights:
 cppflags: []
 cxxflags: []
 enabled-by:
-  not: bsps/arm/xilinx-zynq
+  not:
+  - bsps/aarch64/xilinx-zynqmp
+  - bsps/arm/xilinx-zynq
 includes: []
 install: []
 links: []
diff --git a/spec/build/testsuites/validation/objcachenodisabledata.yml b/spec/build/testsuites/validation/objcachenodisabledata.yml
index 13e0377c2f..0763d9a27d 100644
--- a/spec/build/testsuites/validation/objcachenodisabledata.yml
+++ b/spec/build/testsuites/validation/objcachenodisabledata.yml
@@ -5,7 +5,9 @@ copyrights:
 - Copyright (C) 2024 embedded brains GmbH & Co. KG
 cppflags: []
 cxxflags: []
-enabled-by: bsps/arm/xilinx-zynq
+enabled-by:
+- bsps/aarch64/xilinx-zynqmp
+- bsps/arm/xilinx-zynq
 includes: []
 install: []
 links: []