diff --git a/openapi-cli/src/test/resources/ballerina-to-openapi/expected_gen/post_method.yaml b/openapi-cli/src/test/resources/ballerina-to-openapi/expected_gen/post_method.yaml
index e02c0c708..b5df3c8f7 100644
--- a/openapi-cli/src/test/resources/ballerina-to-openapi/expected_gen/post_method.yaml
+++ b/openapi-cli/src/test/resources/ballerina-to-openapi/expected_gen/post_method.yaml
@@ -79,9 +79,11 @@ paths:
           description: Ok
           headers:
             header2:
+              required: true
               schema:
                 type: string
             header1:
+              required: true
               schema:
                 type: string
           content:
diff --git a/openapi-cli/src/test/resources/ballerina-to-openapi/expected_gen/response/rs_with_headers.yaml b/openapi-cli/src/test/resources/ballerina-to-openapi/expected_gen/response/rs_with_headers.yaml
index 8ea4e8a0d..3addeb0f6 100644
--- a/openapi-cli/src/test/resources/ballerina-to-openapi/expected_gen/response/rs_with_headers.yaml
+++ b/openapi-cli/src/test/resources/ballerina-to-openapi/expected_gen/response/rs_with_headers.yaml
@@ -18,18 +18,22 @@ paths:
           description: Ok
           headers:
             x-rate-limit-enable:
+              required: true
               schema:
                 type: boolean
             x-rate-limit-remaining:
+              required: true
               schema:
                 type: integer
                 format: int64
             x-rate-limit-types:
+              required: true
               schema:
                 type: array
                 items:
                   type: string
             x-rate-limit-id:
+              required: true
               schema:
                 type: string
           content:
diff --git a/openapi-cli/src/test/resources/ballerina-to-openapi/expected_gen/response/typeInclusion_01.yaml b/openapi-cli/src/test/resources/ballerina-to-openapi/expected_gen/response/typeInclusion_01.yaml
index d6ad9643c..f35215aee 100644
--- a/openapi-cli/src/test/resources/ballerina-to-openapi/expected_gen/response/typeInclusion_01.yaml
+++ b/openapi-cli/src/test/resources/ballerina-to-openapi/expected_gen/response/typeInclusion_01.yaml
@@ -63,20 +63,24 @@ paths:
           description: Created
           headers:
             payment-type:
+              required: true
               schema:
                 type: string
             simple-payment-tokens:
+              required: true
               schema:
                 type: array
                 items:
                   type: string
             simple-payment-type:
+              required: true
               schema:
                 type: string
             location:
               schema:
                 type: string
             payment-tokens:
+              required: true
               schema:
                 type: array
                 items:
@@ -120,20 +124,24 @@ paths:
           description: Created
           headers:
             payment-type:
+              required: true
               schema:
                 type: string
             simple-payment-tokens:
+              required: true
               schema:
                 type: array
                 items:
                   type: string
             simple-payment-type:
+              required: true
               schema:
                 type: string
             location:
               schema:
                 type: string
             payment-tokens:
+              required: true
               schema:
                 type: array
                 items: