diff --git a/netbox/dcim/fixtures/initial_data.json b/netbox/dcim/fixtures/initial_data.json
index e765de227..28ea47c8c 100644
--- a/netbox/dcim/fixtures/initial_data.json
+++ b/netbox/dcim/fixtures/initial_data.json
@@ -77,7 +77,18 @@
     "fields": {
         "name": "PDU",
         "slug": "pdu",
-        "color": "607d8b"
+        "color": "607d8b",
+        "vm_role": false
+    }
+},
+{
+    "model": "dcim.devicerole",
+    "pk": 10,
+    "fields": {
+        "name": "UPS",
+        "slug": "ups",
+        "color": "607d8b",
+        "vm_role": false
     }
 },
 {
@@ -143,6 +154,78 @@
         "name": "Super Micro",
         "slug": "super-micro"
     }
+},
+    {
+    "model": "dcim.manufacturer",
+    "pk": 9,
+    "fields": {
+        "name": "Fortinet",
+        "slug": "fortinet"
+    }
+},
+{
+    "model": "dcim.manufacturer",
+    "pk": 10,
+    "fields": {
+        "name": "IBM",
+        "slug": "ibm"
+    }
+},
+{
+    "model": "dcim.manufacturer",
+    "pk": 11,
+    "fields": {
+        "name": "CheckPoint",
+        "slug": "checkpoint"
+    }
+},
+{
+    "model": "dcim.manufacturer",
+    "pk": 12,
+    "fields": {
+        "name": "Lenovo",
+        "slug": "lenovo"
+    }
+},
+{
+    "model": "dcim.manufacturer",
+    "pk": 13,
+    "fields": {
+        "name": "Oracle",
+        "slug": "oracle"
+    }
+},
+{
+    "model": "dcim.manufacturer",
+    "pk": 14,
+    "fields": {
+        "name": "Schneider-Electric",
+        "slug": "schneider-electric"
+    }
+},
+{
+    "model": "dcim.manufacturer",
+    "pk": 15,
+    "fields": {
+        "name": "F5",
+        "slug": "f5"
+    }
+},
+{
+    "model": "dcim.manufacturer",
+    "pk": 15,
+    "fields": {
+        "name": "A10",
+        "slug": "a10"
+    }
+},
+{
+    "model": "dcim.manufacturer",
+    "pk": 15,
+    "fields": {
+        "name": "Riverbed",
+        "slug": "riverbed"
+    }
 },
 {
     "model": "dcim.platform",
@@ -150,6 +233,7 @@
     "fields": {
         "name": "Cisco IOS",
         "slug": "cisco-ios",
+        "manufacturer": "Cisco",
         "rpc_client": "cisco-ios"
     }
 },
@@ -159,6 +243,7 @@
     "fields": {
         "name": "Cisco NX-OS",
         "slug": "cisco-nx-os",
+        "manufacturer": "Cisco",
         "rpc_client": ""
     }
 },
@@ -168,6 +253,7 @@
     "fields": {
         "name": "Juniper Junos",
         "slug": "juniper-junos",
+        "manufacturer": "Juniper",
         "rpc_client": "juniper-junos"
     }
 },
@@ -177,6 +263,7 @@
     "fields": {
         "name": "Arista EOS",
         "slug": "arista-eos",
+        "manufacturer": "Arista",
         "rpc_client": ""
     }
 },
@@ -197,5 +284,98 @@
         "slug": "opengear",
         "rpc_client": "opengear"
     }
+},
+{
+    "model": "dcim.platform",
+    "pk": 7,
+    "fields": {
+        "name": "Windows",
+        "slug": "windows",
+        "rpc_client": ""
+    }
+},
+{
+    "model": "dcim.platform",
+    "pk": 8,
+    "fields": {
+        "name": "Solaris",
+        "slug": "solaris",
+        "rpc_client": ""
+    }
+},
+{
+    "model": "dcim.platform",
+    "pk": 9,
+    "fields": {
+        "name": "SmartDatacenter",
+        "slug": "sdc",
+        "rpc_client": ""
+    }
+},
+{
+    "model": "dcim.platform",
+    "pk": 10,
+    "fields": {
+        "name": "AIX",
+        "slug": "aix",
+        "manufacturer": "IBM",
+        "rpc_client": ""
+    }
+},
+{
+    "model": "dcim.platform",
+    "pk": 11,
+    "fields": {
+        "name": "HP-UX",
+        "slug": "hp-ux",
+        "manufacturer": "HP",
+        "rpc_client": ""
+    }
+},
+{
+    "model": "dcim.platform",
+    "pk": 12,
+    "fields": {
+        "name": "z/OS",
+        "slug": "zos",
+        "manufacturer": "IBM",
+        "rpc_client": ""
+    }
+},
+{
+    "model": "dcim.platform",
+    "pk": 13,
+    "fields": {
+        "name": "FreeBSD",
+        "slug": "freebsd",
+        "rpc_client": ""
+    }
+},
+{
+    "model": "dcim.platform",
+    "pk": 14,
+    "fields": {
+        "name": "OpenBSD",
+        "slug": "openbsd",
+        "rpc_client": ""
+    }
+},
+{
+    "model": "dcim.platform",
+    "pk": 15,
+    "fields": {
+        "name": "VyOS",
+        "slug": "vyos",
+        "rpc_client": ""
+    }
+},
+{
+    "model": "dcim.platform",
+    "pk": 16,
+    "fields": {
+        "name": "GAiA",
+        "slug": "gaia",
+        "rpc_client": ""
+    }
 }
 ]
diff --git a/netbox/virtualization/fixtures/initial_data.json b/netbox/virtualization/fixtures/initial_data.json
index 6f57baffa..0a3259f72 100644
--- a/netbox/virtualization/fixtures/initial_data.json
+++ b/netbox/virtualization/fixtures/initial_data.json
@@ -47,6 +47,22 @@
         "slug": "docker"
     }
 },
+{
+    "model": "virtualization.clustertype",
+    "pk": 7,
+    "fields": {
+        "name": "Kubernetes",
+        "slug": "kubernetes"
+    }
+},
+{
+    "model": "virtualization.clustertype",
+    "pk": 8,
+    "fields": {
+        "name": "SmartDatacenter",
+        "slug": "sdc"
+    }
+},
 {
     "model": "virtualization.clustergroup",
     "pk": 1,
@@ -87,5 +103,27 @@
         "created": "2016-08-01",
         "last_updated": "2016-08-01T15:22:42.289Z"
     }
+},
+{
+    "model": "virtualization.cluster",
+    "pk": 4,
+    "fields": {
+        "name": "Google Cloud Platform",
+        "type": 1,
+        "group": 1,
+        "created": "2018-03-16",
+        "last_updated": "2018-03-16T15:22:42.289Z"
+    }
+},
+{
+    "model": "virtualization.cluster",
+    "pk": 5,
+    "fields": {
+        "name": "IBM Cloud",
+        "type": 1,
+        "group": 1,
+        "created": "2018-03-16",
+        "last_updated": "2018-03-16T15:22:42.289Z"
+    }
 }
 ]