diff --git a/cloud/cloudstack/cs_instance.py b/cloud/cloudstack/cs_instance.py
index ae9cf3ae70c..201449b870d 100644
--- a/cloud/cloudstack/cs_instance.py
+++ b/cloud/cloudstack/cs_instance.py
@@ -801,7 +801,7 @@ def main():
             disk_size = dict(type='int', default=None),
             root_disk_size = dict(type='int', default=None),
             keyboard = dict(choices=['de', 'de-ch', 'es', 'fi', 'fr', 'fr-be', 'fr-ch', 'is', 'it', 'jp', 'nl-be', 'no', 'pt', 'uk', 'us'], default=None),
-            hypervisor = dict(choices=['KVM', 'VMware', 'BareMetal', 'XenServer', 'LXC', 'HyperV', 'UCS', 'OVM'], default=None),
+            hypervisor = dict(choices=['KVM', 'VMware', 'BareMetal', 'XenServer', 'LXC', 'HyperV', 'UCS', 'OVM', 'Simulator'], default=None),
             security_groups = dict(type='list', aliases=[ 'security_group' ], default=[]),
             affinity_groups = dict(type='list', aliases=[ 'affinity_group' ], default=[]),
             domain = dict(default=None),
diff --git a/cloud/cloudstack/cs_template.py b/cloud/cloudstack/cs_template.py
index 8e5b8c24905..d451ece7138 100644
--- a/cloud/cloudstack/cs_template.py
+++ b/cloud/cloudstack/cs_template.py
@@ -534,7 +534,7 @@ def main():
             is_routing = dict(type='bool', choices=BOOLEANS, default=False),
             checksum = dict(default=None),
             template_filter = dict(default='self', choices=['featured', 'self', 'selfexecutable', 'sharedexecutable', 'executable', 'community']),
-            hypervisor = dict(choices=['KVM', 'VMware', 'BareMetal', 'XenServer', 'LXC', 'HyperV', 'UCS', 'OVM'], default=None),
+            hypervisor = dict(choices=['KVM', 'VMware', 'BareMetal', 'XenServer', 'LXC', 'HyperV', 'UCS', 'OVM', 'Simulator'], default=None),
             requires_hvm = dict(type='bool', choices=BOOLEANS, default=False),
             password_enabled = dict(type='bool', choices=BOOLEANS, default=False),
             template_tag = dict(default=None),