diff --git a/includes/definitions/dlink.yaml b/includes/definitions/dlink.yaml
index 48cbda40c3..c25b069e7e 100644
--- a/includes/definitions/dlink.yaml
+++ b/includes/definitions/dlink.yaml
@@ -4,12 +4,11 @@ type: network
 icon: dlink
 ifname: 1
 discovery:
-    - sysDescr:
-        - 'D-Link DES-'
-        - 'Dlink DES-'
-    - sysDescr_regex:
-        - '/^DES-/'
-        - '/^DGS-/'
+    -
+        sysObjectID_except:
+            - .1.3.6.1.4.1.171.10.37.
+        sysObjectID:
+            - .1.3.6.1.4.1.171.10.
 good_if:
     - po
     - vlan
diff --git a/includes/definitions/dlinkap.yaml b/includes/definitions/dlinkap.yaml
index d7ced03f83..95cc0edde7 100644
--- a/includes/definitions/dlinkap.yaml
+++ b/includes/definitions/dlinkap.yaml
@@ -3,7 +3,5 @@ text: 'D-Link Access Point'
 type: wireless
 icon: dlink
 discovery:
-    - sysDescr:
-        - 'D-Link DAP-'
-        - 'D-Link Access Point'
-    - sysDescr_regex: '/D-Link .* AP/'
+    - sysObjectID:
+        - .1.3.6.1.4.1.171.10.37.
diff --git a/tests/data/dlink.json b/tests/data/dlink.json
new file mode 100644
index 0000000000..d86fc052ba
--- /dev/null
+++ b/tests/data/dlink.json
@@ -0,0 +1,40 @@
+{
+    "os": {
+        "discovery": {
+            "devices": [
+                {
+                    "sysName": "",
+                    "sysObjectID": ".1.3.6.1.4.1.171.10.153.7.1",
+                    "sysDescr": "WS6-DGS-1210-52/F1 6.10.007",
+                    "sysContact": null,
+                    "version": null,
+                    "hardware": "",
+                    "features": null,
+                    "location": null,
+                    "os": "dlink",
+                    "type": "network",
+                    "serial": null,
+                    "icon": "dlink.svg"
+                }
+            ]
+        },
+        "poller": {
+            "devices": [
+                {
+                    "sysName": "",
+                    "sysObjectID": ".1.3.6.1.4.1.171.10.153.7.1",
+                    "sysDescr": "WS6-DGS-1210-52/F1 6.10.007",
+                    "sysContact": null,
+                    "version": null,
+                    "hardware": "WS6-DGS-1210-52/F1 Rev. ",
+                    "features": null,
+                    "location": null,
+                    "os": "dlink",
+                    "type": "network",
+                    "serial": null,
+                    "icon": "dlink.svg"
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/data/dlink_dgs-1210-52mp.json b/tests/data/dlink_dgs-1210-52mp.json
new file mode 100644
index 0000000000..dae3e859c5
--- /dev/null
+++ b/tests/data/dlink_dgs-1210-52mp.json
@@ -0,0 +1,40 @@
+{
+    "os": {
+        "discovery": {
+            "devices": [
+                {
+                    "sysName": "",
+                    "sysObjectID": ".1.3.6.1.4.1.171.10.153.10.1",
+                    "sysDescr": "WS6-DGS-1210-52MP/F1 6.10.007",
+                    "sysContact": null,
+                    "version": null,
+                    "hardware": "",
+                    "features": null,
+                    "location": null,
+                    "os": "dlink",
+                    "type": "network",
+                    "serial": null,
+                    "icon": "dlink.svg"
+                }
+            ]
+        },
+        "poller": {
+            "devices": [
+                {
+                    "sysName": "",
+                    "sysObjectID": ".1.3.6.1.4.1.171.10.153.10.1",
+                    "sysDescr": "WS6-DGS-1210-52MP/F1 6.10.007",
+                    "sysContact": null,
+                    "version": null,
+                    "hardware": "WS6-DGS-1210-52MP/F1 Rev. ",
+                    "features": null,
+                    "location": null,
+                    "os": "dlink",
+                    "type": "network",
+                    "serial": null,
+                    "icon": "dlink.svg"
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/snmpsim/dlink.snmprec b/tests/snmpsim/dlink.snmprec
new file mode 100644
index 0000000000..2a4bb4647a
--- /dev/null
+++ b/tests/snmpsim/dlink.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|WS6-DGS-1210-52/F1 6.10.007
+1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.171.10.153.7.1
diff --git a/tests/snmpsim/dlink_des1.snmprec b/tests/snmpsim/dlink_des1.snmprec
index 20ca4d7dc0..3ca9709ff3 100644
--- a/tests/snmpsim/dlink_des1.snmprec
+++ b/tests/snmpsim/dlink_des1.snmprec
@@ -1 +1,2 @@
 1.3.6.1.2.1.1.1.0|4|Dlink DES-
+1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.171.10.63.10
diff --git a/tests/snmpsim/dlink_dgs-1210-52mp.snmprec b/tests/snmpsim/dlink_dgs-1210-52mp.snmprec
new file mode 100644
index 0000000000..61b335f297
--- /dev/null
+++ b/tests/snmpsim/dlink_dgs-1210-52mp.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|WS6-DGS-1210-52MP/F1 6.10.007
+1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.171.10.153.10.1
diff --git a/tests/snmpsim/dlink_dgs.snmprec b/tests/snmpsim/dlink_dgs.snmprec
index 3fd9ccd726..6f79fbf96b 100644
--- a/tests/snmpsim/dlink_dgs.snmprec
+++ b/tests/snmpsim/dlink_dgs.snmprec
@@ -1,2 +1,2 @@
 1.3.6.1.2.1.1.1.0|4|DGS-1100-18 Gigabit Ethernet Switch
-1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.171
+1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.171.10.134.1
diff --git a/tests/snmpsim/dlinkap_2.snmprec b/tests/snmpsim/dlinkap_2.snmprec
index 61d5de9198..5f139ef29f 100644
--- a/tests/snmpsim/dlinkap_2.snmprec
+++ b/tests/snmpsim/dlinkap_2.snmprec
@@ -1 +1,2 @@
 1.3.6.1.2.1.1.1.0|4|D-Link Access Point
+1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.171.10.37.30