diff --git a/functionaltests/resources/v2/action_v2.yaml b/functionaltests/resources/v2/action_v2.yaml
index 24916ef3..45384cda 100644
--- a/functionaltests/resources/v2/action_v2.yaml
+++ b/functionaltests/resources/v2/action_v2.yaml
@@ -5,16 +5,16 @@ greeting:
   description: "This action says 'Hello'"
   base: std.echo
   base-input:
-    output: 'Hello,  {$.name}'
+    output: 'Hello,  <% $.name %>'
   input:
     - name
   output:
-    string: $.output
+    string: <% $.output %>
 
 farewell:
   base: std.echo
   base-input:
     output: 'Bye!'
   output:
-    info: $.output
+    info: <% $.output %>
 
diff --git a/functionaltests/resources/v2/action_v2_tags.yaml b/functionaltests/resources/v2/action_v2_tags.yaml
index 72a22052..e7fa4b80 100644
--- a/functionaltests/resources/v2/action_v2_tags.yaml
+++ b/functionaltests/resources/v2/action_v2_tags.yaml
@@ -6,8 +6,8 @@ greeting:
   tags: [tag, tag1]
   base: std.echo
   base-input:
-    output: 'Hello,  {$.name}'
+    output: 'Hello,  <% $.name %>'
   input:
     - name
   output:
-    string: $.output
+    string: <% $.output %>
diff --git a/functionaltests/resources/v2/wb_v2.yaml b/functionaltests/resources/v2/wb_v2.yaml
index 03253d4e..c6b0223f 100644
--- a/functionaltests/resources/v2/wb_v2.yaml
+++ b/functionaltests/resources/v2/wb_v2.yaml
@@ -10,4 +10,4 @@ workflows:
       hello:
         action: std.echo output="Hello"
         publish:
-            result: $
+            result: <% $.hello %>
diff --git a/functionaltests/resources/v2/wb_with_tags_v2.yaml b/functionaltests/resources/v2/wb_with_tags_v2.yaml
index 382dd95a..8f301e48 100644
--- a/functionaltests/resources/v2/wb_with_tags_v2.yaml
+++ b/functionaltests/resources/v2/wb_with_tags_v2.yaml
@@ -10,4 +10,4 @@ workflows:
       hello:
         action: std.echo output="Hello"
         publish:
-            result: $
+            result: <% $.hello %>
diff --git a/functionaltests/resources/v2/wf_delay_v2.yaml b/functionaltests/resources/v2/wf_delay_v2.yaml
index de3118d5..0949a64a 100644
--- a/functionaltests/resources/v2/wf_delay_v2.yaml
+++ b/functionaltests/resources/v2/wf_delay_v2.yaml
@@ -9,7 +9,7 @@ wf:
     hello:
       action: std.echo output="Hello"
       publish:
-        result: $.hello
+        result: <% $.hello %>
       policies:
         wait-after: 1
       on-success:
@@ -18,4 +18,4 @@ wf:
     task2:
       action: std.echo output="Task 2"
       publish:
-        task2: $.task2
+        task2: <% $.task2 %>
diff --git a/functionaltests/resources/v2/wf_v2.yaml b/functionaltests/resources/v2/wf_v2.yaml
index 5eb75cee..91caa632 100644
--- a/functionaltests/resources/v2/wf_v2.yaml
+++ b/functionaltests/resources/v2/wf_v2.yaml
@@ -9,7 +9,7 @@ wf:
       policies:
         wait-before: 5
       publish:
-        result: $
+        result: <% $.hello %>
 
 wf1:
   type: reverse
@@ -20,7 +20,7 @@ wf1:
     addressee:
       action: std.echo output="John"
       publish:
-        name: $
+        name: <% $.addressee %>
     goodbye:
-      action: std.echo output="{$.farewell}, {$.name}"
+      action: std.echo output="<% $.farewell %>, <% $.name %>"
       requires: [addressee]
diff --git a/mistralclient/tests/unit/v2/test_cli_actions.py b/mistralclient/tests/unit/v2/test_cli_actions.py
index e48e9bfc..68445223 100644
--- a/mistralclient/tests/unit/v2/test_cli_actions.py
+++ b/mistralclient/tests/unit/v2/test_cli_actions.py
@@ -37,8 +37,8 @@ version: '2.0'
 
 base: std.echo
 base-parameters:
-    output: "{$.str1}{$.str2}"
-output: "{$}{$}"
+    output: "<% $.str1 %><% $.str2 %>"
+output: "<% $ %><% $ %>"
 """
 
 ACTION_WITH_DEF_DICT = ACTION_DICT.copy()