diff --git a/includes/definitions/discovery/nxos.yaml b/includes/definitions/discovery/ucos.yaml
similarity index 100%
rename from includes/definitions/discovery/nxos.yaml
rename to includes/definitions/discovery/ucos.yaml
diff --git a/includes/definitions/nxos.yaml b/includes/definitions/nxos.yaml
index f5147840bc..88e97c5071 100644
--- a/includes/definitions/nxos.yaml
+++ b/includes/definitions/nxos.yaml
@@ -34,3 +34,7 @@ discovery:
         sysDescr:
             - NX-OS(tm)
             - Cisco NX-OS
+        sysDescr_except:
+            - Cisco NX-OS(tm) ucs # exclude UCS, and indentify as "UCOS" OS
+        sysObjectID_except:
+            - .1.3.6.1.4.1.9.12.3.1.3.1062 # exclude UCS, and indentify as "UCOS" OS
diff --git a/includes/definitions/ucos.yaml b/includes/definitions/ucos.yaml
index c18672a934..be4494e60b 100644
--- a/includes/definitions/ucos.yaml
+++ b/includes/definitions/ucos.yaml
@@ -29,6 +29,8 @@ discovery:
     -
         sysObjectID:
             - .1.3.6.1.4.1.9.1.1348
+            - .1.3.6.1.4.1.9.12.3.1.3.1062
     -
         sysDescr:
             - 'Software:UCOS'
+            - 'Cisco NX-OS(tm) ucs'
diff --git a/tests/data/nxos_2.json b/tests/data/ucos_2.json
similarity index 99%
rename from tests/data/nxos_2.json
rename to tests/data/ucos_2.json
index 42b75a2669..23571c9cc2 100644
--- a/tests/data/nxos_2.json
+++ b/tests/data/ucos_2.json
@@ -10,15 +10,32 @@
                     "version": null,
                     "hardware": null,
                     "features": null,
-                    "os": "nxos",
-                    "type": "network",
+                    "os": "ucos",
+                    "type": "collaboration",
                     "serial": null,
                     "icon": "cisco.svg",
                     "location": null
                 }
             ]
         },
-        "poller": "matches discovery"
+        "poller": {
+            "devices": [
+                {
+                    "sysName": "",
+                    "sysObjectID": ".1.3.6.1.4.1.9.12.3.1.3.1062",
+                    "sysDescr": "Cisco NX-OS(tm) ucs, Software (ucs-6100-k9-system), Version 5.0(3)N2(3.13b), RELEASE SOFTWARE Copyright (c) 2002-2013 by Cisco Systems, Inc.   Compiled 6/28/2017 0:00:00",
+                    "sysContact": null,
+                    "version": null,
+                    "hardware": "ciscoModules.3.1.3.1062",
+                    "features": null,
+                    "os": "ucos",
+                    "type": "collaboration",
+                    "serial": null,
+                    "icon": "cisco.svg",
+                    "location": null
+                }
+            ]
+        }
     },
     "sensors": {
         "discovery": {
diff --git a/tests/snmpsim/nxos_2.snmprec b/tests/snmpsim/ucos_2.snmprec
similarity index 100%
rename from tests/snmpsim/nxos_2.snmprec
rename to tests/snmpsim/ucos_2.snmprec