diff --git a/apiclient/harvester_api/managers/templates.py b/apiclient/harvester_api/managers/templates.py
index a425e71ed..1efd9aef1 100644
--- a/apiclient/harvester_api/managers/templates.py
+++ b/apiclient/harvester_api/managers/templates.py
@@ -1,4 +1,4 @@
-from harvester_api.models.templates import TemplateSpec
+from harvester_api.models.templates import TemplateSpec, TemplateSpec140
 from .base import DEFAULT_NAMESPACE, BaseManager
 
 
@@ -49,3 +49,8 @@ def delete(self, name, namespace=DEFAULT_NAMESPACE, *, raw=False):
 
     def delete_version(self, name, namespace=DEFAULT_NAMESPACE, *, raw=False):
         return self._delete(self.VER_PATH_fmt.format(uid=name, ns=namespace), raw=raw)
+
+
+class TemplateManager140(TemplateManager):
+    support_to = "v1.4.0"
+    Spec = TemplateSpec140
diff --git a/apiclient/harvester_api/models/templates.py b/apiclient/harvester_api/models/templates.py
index 917dcd5b4..ff9ff479d 100644
--- a/apiclient/harvester_api/models/templates.py
+++ b/apiclient/harvester_api/models/templates.py
@@ -1,4 +1,4 @@
-from .virtualmachines import VMSpec
+from .virtualmachines import VMSpec, VMSpec140
 
 
 class TemplateSpec(VMSpec):
@@ -37,3 +37,7 @@ def from_dict(cls, data):
         vd['type'] = "kubevirt.io.virtualmachine"
         vd['spec']['template']['spec']['hostname'] = ""
         return super().from_dict(vd)
+
+
+class TemplateSpec140(TemplateSpec, VMSpec140):
+    pass
diff --git a/harvester_e2e_tests/integrations/test_4_vm_template.py b/harvester_e2e_tests/integrations/test_4_vm_template.py
index 2afaa6781..d4d3461d3 100644
--- a/harvester_e2e_tests/integrations/test_4_vm_template.py
+++ b/harvester_e2e_tests/integrations/test_4_vm_template.py
@@ -76,7 +76,6 @@ def stopped_vm(api_client, ssh_keypair, wait_timeout, image, unique_name):
 @pytest.mark.templates
 @pytest.mark.virtualmachines
 class TestVMTemplate:
-    @pytest.mark.xfail(reason="test issue https://github.com/harvester/tests/issues/2388")
     def test_create_template_with_data(
         self, api_client, vm_shell_from_host, vm_checker, ssh_keypair, wait_timeout, stopped_vm
     ):