diff --git a/tests/features/CAPIF Api Access Control Policy/capif_api_access_control_policy.robot b/tests/features/CAPIF Api Access Control Policy/capif_api_access_control_policy.robot
index 05716c20a5c3c846ccc649300183597f7f3d36f8..12844d5116ebfd0dfb7aea39bc16f1cc2fc96ccf 100644
--- a/tests/features/CAPIF Api Access Control Policy/capif_api_access_control_policy.robot	
+++ b/tests/features/CAPIF Api Access Control Policy/capif_api_access_control_policy.robot	
@@ -364,12 +364,8 @@ Retrieve ACL filtered by api-invoker-id
     ...    ${resp.json()['apiInvokerPolicies'][0]['apiInvokerId']}
     ...    ${register_user_info_invoker_2['api_invoker_id']}
 
-Retrieve ACL filtered by supported-features
-    [Tags]    capif_api_acl-5
-    Skip    Test ${TEST_NAME} is not currently supported by CAPIF
-
 Retrieve ACL with aef-id not valid
-    [Tags]    capif_api_acl-6
+    [Tags]    capif_api_acl-5
     ${register_user_info_invoker}
     ...    ${register_user_info_provider}
     ...    ${service_api_description_published}=
@@ -393,7 +389,7 @@ Retrieve ACL with aef-id not valid
     ...    cause=Wrong id
 
 Retrieve ACL with service-id not valid
-    [Tags]    capif_api_acl-7
+    [Tags]    capif_api_acl-6
     ${register_user_info_invoker}
     ...    ${register_user_info_provider}
     ...    ${service_api_description_published}=
@@ -416,7 +412,7 @@ Retrieve ACL with service-id not valid
     ...    cause=Wrong id
 
 Retrieve ACL with service-api-id and aef-id not valid
-    [Tags]    capif_api_acl-8
+    [Tags]    capif_api_acl-7
     ${register_user_info_invoker}
     ...    ${register_user_info_provider}
     ...    ${service_api_description_published}=
@@ -439,7 +435,7 @@ Retrieve ACL with service-api-id and aef-id not valid
     ...    cause=Wrong id
 
 Retrieve ACL without SecurityContext created previously by Invoker
-    [Tags]    capif_api_acl-9
+    [Tags]    capif_api_acl-8
     ${register_user_info_invoker}
     ...    ${register_user_info_provider}
     ...    ${service_api_description_published}=
@@ -463,7 +459,7 @@ Retrieve ACL without SecurityContext created previously by Invoker
     ...    cause=Wrong id
 
 Retrieve ACL filtered by api-invoker-id not present
-    [Tags]    capif_api_acl-10
+    [Tags]    capif_api_acl-9
     ${register_user_info_invoker}
     ...    ${register_user_info_provider}
     ...    ${service_api_description_published}=
@@ -486,7 +482,7 @@ Retrieve ACL filtered by api-invoker-id not present
     ...    cause=Wrong id
 
 Retrieve ACL with APF Certificate
-    [Tags]    capif_api_acl-11
+    [Tags]    capif_api_acl-10
     ${register_user_info_invoker}
     ...    ${register_user_info_provider}
     ...    ${service_api_description_published}=
@@ -506,7 +502,7 @@ Retrieve ACL with APF Certificate
     ...    cause=Certificate not authorized
 
 Retrieve ACL with AMF Certificate
-    [Tags]    capif_api_acl-12
+    [Tags]    capif_api_acl-11
     ${register_user_info_invoker}
     ...    ${register_user_info_provider}
     ...    ${service_api_description_published}=
@@ -526,7 +522,7 @@ Retrieve ACL with AMF Certificate
     ...    cause=Certificate not authorized
 
 Retrieve ACL with Invoker Certificate
-    [Tags]    capif_api_acl-13    smoke
+    [Tags]    capif_api_acl-12    smoke
     ${register_user_info_invoker}
     ...    ${register_user_info_provider}
     ...    ${service_api_description_published}=
@@ -546,7 +542,7 @@ Retrieve ACL with Invoker Certificate
     ...    cause=Certificate not authorized
 
 No ACL for invoker after be removed
-    [Tags]    capif_api_acl-14
+    [Tags]    capif_api_acl-13
     ${register_user_info_invoker}
     ...    ${register_user_info_provider}
     ...    ${service_api_description_published}=