diff --git a/includes/rewrites.php b/includes/rewrites.php
index 62623a8ac3..a8ba186f25 100644
--- a/includes/rewrites.php
+++ b/includes/rewrites.php
@@ -414,6 +414,8 @@ function rewrite_extreme_hardware($hardware)
         '.1.3.6.1.4.1.1916.2.141' => 'Summit x480-48x',
         '.1.3.6.1.4.1.1916.2.167' => 'Summit x670-48x',
         '.1.3.6.1.4.1.1916.2.168' => 'Summit x670v-48x',
+        '.1.3.6.1.4.1.1916.2.118' => 'Summit X650-24x(SSns)',
+        '.1.3.6.1.4.1.1916.2.139' => 'Summit X480-24x(10G4X)',
     );
 
     // $hardware = array_str_replace($rewrite_extreme_hardware, $hardware);
diff --git a/tests/data/xos_x480.json b/tests/data/xos_x480.json
new file mode 100644
index 0000000000..71da3c580b
--- /dev/null
+++ b/tests/data/xos_x480.json
@@ -0,0 +1,40 @@
+{
+    "os": {
+        "discovery": {
+            "devices": [
+                {
+                    "sysName": "<private>",
+                    "sysObjectID": ".1.3.6.1.4.1.1916.2.139",
+                    "sysDescr": "ExtremeXOS (X480-24x(10G4X)) version 15.3.5.2 v1535b2-patch1-13 by release-manager on Thu Dec 15 11:08:24 EST 2016",
+                    "sysContact": null,
+                    "version": null,
+                    "hardware": "",
+                    "features": null,
+                    "location": null,
+                    "os": "xos",
+                    "type": "network",
+                    "serial": null,
+                    "icon": "extreme.svg"
+                }
+            ]
+        },
+        "poller": {
+            "devices": [
+                {
+                    "sysName": "<private>",
+                    "sysObjectID": ".1.3.6.1.4.1.1916.2.139",
+                    "sysDescr": "ExtremeXOS (X480-24x(10G4X)) version 15.3.5.2 v1535b2-patch1-13 by release-manager on Thu Dec 15 11:08:24 EST 2016",
+                    "sysContact": "<private>",
+                    "version": "15.3.5.2",
+                    "hardware": "Summit X480-24x(10G4X)",
+                    "features": "v1535b2-patch1-13 Dec 15 2016",
+                    "location": "<private>",
+                    "os": "xos",
+                    "type": "network",
+                    "serial": null,
+                    "icon": "extreme.svg"
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/data/xos_x650.json b/tests/data/xos_x650.json
new file mode 100644
index 0000000000..ecfe05a6f5
--- /dev/null
+++ b/tests/data/xos_x650.json
@@ -0,0 +1,40 @@
+{
+    "os": {
+        "discovery": {
+            "devices": [
+                {
+                    "sysName": "<private>",
+                    "sysObjectID": ".1.3.6.1.4.1.1916.2.118",
+                    "sysDescr": "ExtremeXOS (X650-24x(SSns)) version 15.3.5.2 v1535b2-patch1-14 by release-manager on Fri Jun 16 08:43:13 EDT 2017",
+                    "sysContact": null,
+                    "version": null,
+                    "hardware": "",
+                    "features": null,
+                    "location": null,
+                    "os": "xos",
+                    "type": "network",
+                    "serial": null,
+                    "icon": "extreme.svg"
+                }
+            ]
+        },
+        "poller": {
+            "devices": [
+                {
+                    "sysName": "<private>",
+                    "sysObjectID": ".1.3.6.1.4.1.1916.2.118",
+                    "sysDescr": "ExtremeXOS (X650-24x(SSns)) version 15.3.5.2 v1535b2-patch1-14 by release-manager on Fri Jun 16 08:43:13 EDT 2017",
+                    "sysContact": "<private>",
+                    "version": "15.3.5.2",
+                    "hardware": "Summit X650-24x(SSns)",
+                    "features": "v1535b2-patch1-14 Jun 16 2017",
+                    "location": "<private>",
+                    "os": "xos",
+                    "type": "network",
+                    "serial": null,
+                    "icon": "extreme.svg"
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/snmpsim/xos_x480.snmprec b/tests/snmpsim/xos_x480.snmprec
new file mode 100644
index 0000000000..66c59d8af6
--- /dev/null
+++ b/tests/snmpsim/xos_x480.snmprec
@@ -0,0 +1,7 @@
+1.3.6.1.2.1.1.1.0|4|ExtremeXOS (X480-24x(10G4X)) version 15.3.5.2 v1535b2-patch1-13 by release-manager on Thu Dec 15 11:08:24 EST 2016
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.1916.2.139
+1.3.6.1.2.1.1.3.0|67|2391339200
+1.3.6.1.2.1.1.4.0|4|<private>
+1.3.6.1.2.1.1.5.0|4|<private>
+1.3.6.1.2.1.1.6.0|4|<private>
+1.3.6.1.6.3.10.2.1.3.0|2|23913209
diff --git a/tests/snmpsim/xos_x650.snmprec b/tests/snmpsim/xos_x650.snmprec
new file mode 100644
index 0000000000..a8fa1f451d
--- /dev/null
+++ b/tests/snmpsim/xos_x650.snmprec
@@ -0,0 +1,7 @@
+1.3.6.1.2.1.1.1.0|4|ExtremeXOS (X650-24x(SSns)) version 15.3.5.2 v1535b2-patch1-14 by release-manager on Fri Jun 16 08:43:13 EDT 2017
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.1916.2.118
+1.3.6.1.2.1.1.3.0|67|700626400
+1.3.6.1.2.1.1.4.0|4|<private>
+1.3.6.1.2.1.1.5.0|4|<private>
+1.3.6.1.2.1.1.6.0|4|<private>
+1.3.6.1.6.3.10.2.1.3.0|2|7006245