diff --git a/tests/test-chat-template.cpp b/tests/test-chat-template.cpp
index e0314ae1d..d970beb57 100644
--- a/tests/test-chat-template.cpp
+++ b/tests/test-chat-template.cpp
@@ -262,6 +262,14 @@ int main(void) {
             /* .bos_token= */ "",
             /* .eos_token= */ "",
         },
+        {
+            /* .name= */ "velvet",
+            /* .template_str= */ "{%- if messages[0][\"role\"] == \"system\" %}\n    {%- set system_message = messages[0][\"content\"] %}\n    {%- set loop_messages = messages[1:] %}\n{%- else %}\n    {%- set loop_messages = messages %}\n{%- endif %}\n{%- if not tools is defined %}\n    {%- set tools = none %}\n{%- endif %}\n{%- set user_messages = loop_messages | selectattr(\"role\", \"equalto\", \"user\") | list %}\n\n{#- This block checks for alternating user/assistant messages, skipping tool calling messages #}\n{%- set ns = namespace() %}\n{%- set ns.index = 0 %}\n{%- for message in loop_messages %}\n    {%- if not (message.role == \"tool\" or message.role == \"tool_results\" or (message.tool_calls is defined and message.tool_calls is not none)) %}\n        {%- if (message[\"role\"] == \"user\") != (ns.index % 2 == 0) %}\n            {{- raise_exception(\"After the optional system message, conversation roles must alternate user/assistant/user/assistant/...\") }}\n        {%- endif %}\n        {%- set ns.index = ns.index + 1 %}\n    {%- endif %}\n{%- endfor %}\n\n{{- bos_token }}\n{%- for message in loop_messages %}\n    {%- if message[\"role\"] == \"user\" %}\n        {%- if message == user_messages[-1] and system_message is defined and tools is not none %}\n            {{- \"<instruction>\" + system_message + \"\\n\\n\" + \"<list_tools>[\" }}\n            {%- for tool in tools %}\n{{ tool }}\n {%- if not loop.last %}\n                    {{- \", \" }}\n                {%- else %}\n                    {{- \"]\" }}\n {%- endif %}\n    {%- endfor %}\n            {{- \"</list_tools>\" + \"\\n\\n\" + message[\"content\"] + \"</instruction>\" }}\n            {%- elif message == user_messages[-1] and system_message is defined  and tools is none %}\n            {{- \"<instruction>\" + system_message + \"\\n\\n\" + message[\"content\"] + \"</instruction>\" }}\n        {%- else %}\n            {{- \"<instruction>\" + message[\"content\"] + \"</instruction>\" }}\n        {%- endif %}\n    {%- elif (message.tool_calls is defined and message.tool_calls is not none) %}\n        {{- \"<tool_call>[\" }}\n        {%- for tool_call in message.tool_calls %}\n{{ tool_call }}\n {%- if not loop.last %}\n                    {{- \", \" }}\n                {%- else %}\n                    {{- \"]\" }}\n {%- endif %}\n {%- endfor %}      {{- \"</tool_call>\" + eos_token }}\n            {%- elif message[\"role\"] == \"assistant\" %}\n        {{- message[\"content\"] + eos_token}}\n    {%- elif message[\"role\"] == \"tool_results\" or message[\"role\"] == \"tool\" %}\n        {%- if message.content is defined and message.content.content is defined %}\n            {%- set content = message.content.content %}\n        {%- else %}\n            {%- set content = message.content %}\n        {%- endif %}\n        {{- '<tool_result>{\"content\": ' + content|string }}\n    {{- '}</tool_result>' }}\n    {%- else %}\n        {{- raise_exception(\"Only user and assistant roles are supported, with the exception of an initial optional system message!\") }}\n    {%- endif %}\n{%- endfor %}\n",
+            /* .expected_output= */ "<s><instruction>Hello</instruction>Hi there</s><instruction>Who are you</instruction>   I am an assistant   </s><instruction>You are a helpful assistant\n\nAnother question</instruction>",
+            /* .expected_output_jinja= */ "<s><instruction>Hello</instruction>Hi there</s><instruction>Who are you</instruction>   I am an assistant   </s><instruction>You are a helpful assistant\n\nAnother question</instruction>",
+            /* .bos_token= */ "<s>",
+            /* .eos_token= */ "</s>",
+        },
     };
     std::vector<char> formatted_chat(1024);
     int32_t res;