diff --git a/test_pool/drtm/interface010.c b/test_pool/drtm/interface010.c
index 4ef9777e..d7115a48 100644
--- a/test_pool/drtm/interface010.c
+++ b/test_pool/drtm/interface010.c
@@ -102,7 +102,7 @@ interface010_entry(uint32_t num_pe)
 
   if (status != ACS_STATUS_SKIP) {
       if (val_gic_its_configure() != ACS_STATUS_PASS)
-          return TEST_SKIP;
+          return RESULT_SKIP(0);
       /* execute payload, which will execute relevant functions on current and other PEs */
       payload(num_pe);
   }
diff --git a/test_pool/drtm/interface011.c b/test_pool/drtm/interface011.c
index b25c6499..a12b0d54 100644
--- a/test_pool/drtm/interface011.c
+++ b/test_pool/drtm/interface011.c
@@ -91,7 +91,7 @@ interface011_entry(uint32_t num_pe)
 
   if (status != ACS_STATUS_SKIP) {
       if (val_gic_its_configure() != ACS_STATUS_PASS)
-          return TEST_SKIP;
+          return RESULT_SKIP(0);
       /* execute payload, which will execute relevant functions on current and other PEs */
       payload(num_pe);
   }
diff --git a/val/src/test_wrappers.c b/val/src/test_wrappers.c
index 0019f561..ecdee80f 100644
--- a/val/src/test_wrappers.c
+++ b/val/src/test_wrappers.c
@@ -444,7 +444,7 @@ v_l1wk_02_05_entry(uint32_t num_pe)
 {
 #ifdef TARGET_LINUX
     // Test not applicable for Linux target
-    return TEST_SKIP;
+    return RESULT_SKIP(0);
 #endif
 
     if (acs_policy_get_el1skiptrap_mask() & EL1SKIPTRAP_CNTPCT) {