diff --git a/includes/definitions/discovery/moxa-etherdevice.yaml b/includes/definitions/discovery/moxa-etherdevice.yaml
index bc0b5b70ce..df25bb16ff 100644
--- a/includes/definitions/discovery/moxa-etherdevice.yaml
+++ b/includes/definitions/discovery/moxa-etherdevice.yaml
@@ -36,7 +36,7 @@ modules:
             - MOXA-EDSG512E-MIB::switchModel.0
             - MOXA-EDSG516E-MIB::switchModel.0
             - MOXA-EDSP506E-MIB::switchModel.0
-            - MOXA-EDSP510A8POE-MIB::switchModel
+            - MOXA-EDSP510A8POE-MIB::switchModel.0
             - MOXA-EDSG512E8POE-MIB::switchModel
         version:
             - MOXA-IKS6726A-MIB::firmwareVersion
@@ -44,7 +44,7 @@ modules:
             - MOXA-EDSG512E-MIB::firmwareVersion.0
             - MOXA-EDSG516E-MIB::firmwareVersion.0
             - MOXA-EDSP506E-MIB::firmwareVersion.0
-            - MOXA-EDSP510A8POE-MIB::firmwareVersion
+            - MOXA-EDSP510A8POE-MIB::firmwareVersion.0
             - MOXA-EDSG512E8POE-MIB::firmwareVersion
         serial:
             - MOXA-EDSG508E-MIB::serialNumber
@@ -320,4 +320,3 @@ modules:
                     states:
                         - { value:  0, generic: 2, graph: 0, descr: not present }
                         - { value:  1, generic: 0, graph: 0, descr: present }
-
diff --git a/tests/data/moxa-etherdevice_edsp510a8poe.json b/tests/data/moxa-etherdevice_edsp510a8poe.json
index c43c1c297c..2775c5a29f 100644
--- a/tests/data/moxa-etherdevice_edsp510a8poe.json
+++ b/tests/data/moxa-etherdevice_edsp510a8poe.json
@@ -380,8 +380,8 @@
                     "sysObjectID": ".1.3.6.1.4.1.8691.7.86",
                     "sysDescr": "EDS-P510A-8PoE-2GTXSFP-T",
                     "sysContact": "<private>",
-                    "version": null,
-                    "hardware": null,
+                    "version": "V3.11 build 24011616",
+                    "hardware": "EDS-P510A-8PoE-2GTXSFP-T",
                     "features": null,
                     "location": "<private>",
                     "os": "moxa-etherdevice",
@@ -1615,7 +1615,7 @@
                     "mempool_used": 16580452,
                     "mempool_used_oid": ".1.3.6.1.4.1.8691.7.86.1.58.0",
                     "mempool_free": 35848348,
-                    "mempool_free_oid": null,
+                    "mempool_free_oid": ".1.3.6.1.4.1.8691.7.86.1.57.0",
                     "mempool_total": 52428800,
                     "mempool_total_oid": null,
                     "mempool_largestfree": null,
diff --git a/tests/snmpsim/moxa-etherdevice_edsp510a8poe.snmprec b/tests/snmpsim/moxa-etherdevice_edsp510a8poe.snmprec
index ba017523cb..050ae707be 100644
--- a/tests/snmpsim/moxa-etherdevice_edsp510a8poe.snmprec
+++ b/tests/snmpsim/moxa-etherdevice_edsp510a8poe.snmprec
@@ -34,3 +34,5 @@
 1.3.6.1.4.1.8691.7.86.1.57.0|2|35848348
 1.3.6.1.4.1.8691.7.86.1.58.0|2|16580452
 1.3.6.1.6.3.10.2.1.3.0|2|1541360
+1.3.6.1.4.1.8691.7.86.1.2.0|4|EDS-P510A-8PoE-2GTXSFP-T
+1.3.6.1.4.1.8691.7.86.1.4.0|4|V3.11 build 24011616