diff --git a/netbox/templates/virtualization/cluster_edit.html b/netbox/templates/virtualization/cluster_edit.html
index 0e188d8ab..bf81ffd42 100644
--- a/netbox/templates/virtualization/cluster_edit.html
+++ b/netbox/templates/virtualization/cluster_edit.html
@@ -12,6 +12,13 @@
             {% render_field form.site %}
         </div>
     </div>
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Tenancy</strong></div>
+        <div class="panel-body">
+            {% render_field form.tenant_group %}
+            {% render_field form.tenant %}
+        </div>
+    </div>
     {% if form.custom_fields %}
         <div class="panel panel-default">
             <div class="panel-heading"><strong>Custom Fields</strong></div>
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index 712c5e1fa..acf79a2b7 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -77,7 +77,7 @@ class ClusterGroupCSVForm(forms.ModelForm):
 # Clusters
 #
 
-class ClusterForm(BootstrapMixin, CustomFieldForm):
+class ClusterForm(BootstrapMixin, TenancyForm, CustomFieldForm):
     comments = CommentField()
     tags = TagField(
         required=False