diff --git a/mistral/tests/resources/openstack/action_collection_wb.yaml b/mistral/tests/resources/openstack/action_collection_wb.yaml
index dd669cca..3f6a5340 100644
--- a/mistral/tests/resources/openstack/action_collection_wb.yaml
+++ b/mistral/tests/resources/openstack/action_collection_wb.yaml
@@ -1,5 +1,5 @@
 ---
-version: 2.0
+version: '2.0'
 name: action_collection
 
 workflows:
diff --git a/mistral/tests/resources/wb_v2.yaml b/mistral/tests/resources/wb_v2.yaml
index f3e06d39..f22c593b 100644
--- a/mistral/tests/resources/wb_v2.yaml
+++ b/mistral/tests/resources/wb_v2.yaml
@@ -1,5 +1,5 @@
 ---
-version: 2.0
+version: '2.0'
 name: test
 
 workflows:
diff --git a/mistral/tests/unit/engine1/test_join.py b/mistral/tests/unit/engine1/test_join.py
index b36564a7..34009423 100644
--- a/mistral/tests/unit/engine1/test_join.py
+++ b/mistral/tests/unit/engine1/test_join.py
@@ -28,7 +28,7 @@ cfg.CONF.set_default('auth_enable', False, group='pecan')
 
 WF_FULL_JOIN = """
 ---
-version: 2.0
+version: '2.0'
 
 wf:
   type: direct
@@ -61,7 +61,7 @@ wf:
 
 WF_FULL_JOIN_WITH_ERRORS = """
 ---
-version: 2.0
+version: '2.0'
 
 wf:
   type: direct
@@ -91,7 +91,7 @@ wf:
 
 WF_FULL_JOIN_WITH_CONDITIONS = """
 ---
-version: 2.0
+version: '2.0'
 
 wf:
   type: direct
@@ -129,7 +129,7 @@ wf:
 
 WF_PARTIAL_JOIN = """
 ---
-version: 2.0
+version: '2.0'
 
 wf:
   type: direct
@@ -173,7 +173,7 @@ wf:
 
 WF_PARTIAL_JOIN_TRIGGERS_ONCE = """
 ---
-version: 2.0
+version: '2.0'
 
 wf:
   type: direct
@@ -221,7 +221,7 @@ wf:
 
 WF_DISCRIMINATOR = """
 ---
-version: 2.0
+version: '2.0'
 
 wf:
   type: direct
@@ -429,7 +429,7 @@ class JoinEngineTest(base.EngineTestCase):
 
     def test_full_join_parallel_published_vars(self):
         wfs_tasks_join_complex = """---
-        version: 2.0
+        version: '2.0'
 
         main:
           type: direct
diff --git a/resources/actions/wait_ssh.yaml b/resources/actions/wait_ssh.yaml
index 0f9127d3..293418da 100644
--- a/resources/actions/wait_ssh.yaml
+++ b/resources/actions/wait_ssh.yaml
@@ -1,5 +1,5 @@
 ---
-version: 2.0
+version: '2.0'
 
 std.wait_ssh:
     description: Simple SSH command.
@@ -12,4 +12,4 @@ std.wait_ssh:
     input:
      - host
      - username
-     - password
\ No newline at end of file
+     - password
diff --git a/resources/workflows/create_instance.yaml b/resources/workflows/create_instance.yaml
index 0de451da..5681f06b 100644
--- a/resources/workflows/create_instance.yaml
+++ b/resources/workflows/create_instance.yaml
@@ -1,5 +1,5 @@
 ---
-version: 2.0
+version: '2.0'
 
 std.create_instance:
   type: direct