diff --git a/tests/features/Vendor Extensibility/vendor_extensibility.robot b/tests/features/Vendor Extensibility/vendor_extensibility.robot
index b14dc71996b805d55ec5ae038ed1613f12bd50f4..d41926295d3d0a5b2e6ec788ebf30f96b4e4c896 100644
--- a/tests/features/Vendor Extensibility/vendor_extensibility.robot	
+++ b/tests/features/Vendor Extensibility/vendor_extensibility.robot	
@@ -44,7 +44,7 @@ Published API with vendor extensibility
 
     # Test
     ${resp}=    Get Request Capif
-    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info['aef_id']}&supported_features=2
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info['aef_id']}&supported-features=2
     ...    server=${CAPIF_HTTPS_URL}
     ...    verify=ca.crt
     ...    username=${INVOKER_USERNAME}
@@ -87,7 +87,7 @@ Published API with vendor extensibility and discover with VendSpecQueryParams di
 
     # Test
     ${resp}=    Get Request Capif
-    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info['aef_id']}&supported_features=0
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info['aef_id']}&supported-features=0
     ...    server=${CAPIF_HTTPS_URL}
     ...    verify=ca.crt
     ...    username=${INVOKER_USERNAME}
@@ -184,8 +184,8 @@ Publish API with vendorExt active but without vendorSpecifics
     ...    ProblemDetails
     ...    title=Bad Request
     ...    status=400
-    ...    detail=VendorExt feature active at Supported Features but VendorSpecifics parameters not published
-    ...    cause=VendorExt feature active but vendorSpecifics not present
+    ...    detail=If and only if VendorExt feature is enabled, then vendor-specific fields should be defined
+    ...    cause=Vendor extensibility misconfiguration
 
 Publish API with vendorExt inactive but with vendorSpecifics
     [Tags]    vendor_extensibility-5
@@ -220,8 +220,8 @@ Publish API with vendorExt inactive but with vendorSpecifics
     ...    ProblemDetails
     ...    title=Bad Request
     ...    status=400
-    ...    detail=VendorExt feature inactive at Supported Features but VendorSpecifics are present parameters published
-    ...    cause=VendorExt feature inactive but vendorSpecifics present
+    ...    detail=If and only if VendorExt feature is enabled, then vendor-specific fields should be defined
+    ...    cause=Vendor extensibility misconfiguration
 
 Published API without vendor extensibility discover with VendSpecQueryParams enabled
     [Tags]    vendor_extensibility-6
@@ -238,7 +238,7 @@ Published API without vendor extensibility discover with VendSpecQueryParams ena
 
     # Test
     ${resp}=    Get Request Capif
-    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info['aef_id']}&supported_features=2
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info['aef_id']}&supported-features=2
     ...    server=${CAPIF_HTTPS_URL}
     ...    verify=ca.crt
     ...    username=${INVOKER_USERNAME}
@@ -267,7 +267,7 @@ Published API without vendor extensibility and discover with vendSpecQueryParams
 
     # Test
     ${resp}=    Get Request Capif
-    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info['aef_id']}&supported_features=0
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info['aef_id']}&supported-features=0
     ...    server=${CAPIF_HTTPS_URL}
     ...    verify=ca.crt
     ...    username=${INVOKER_USERNAME}
@@ -331,5 +331,5 @@ Publish API without supportedFeatures
     ...    ProblemDetails
     ...    title=Bad Request
     ...    status=400
-    ...    detail=supportedFeatures must be present in this request
-    ...    cause=supportedFeatures missed
+    ...    detail=supportedFeatures not present in request
+    ...    cause=supportedFeatures not present