diff --git a/includes/definitions/openvms.yaml b/includes/definitions/openvms.yaml
new file mode 100644
index 0000000000..eb5e2c6f38
--- /dev/null
+++ b/includes/definitions/openvms.yaml
@@ -0,0 +1,7 @@
+os: openvms
+type: server
+text: 'HPE OpenVMS'
+icon: 'hpe'
+bad_hrSystemUptime: true
+discovery:
+    - sysObjectId: .1.3.6.1.4.1.36.2.15.22.1
diff --git a/tests/snmpsim/openvms.snmprec b/tests/snmpsim/openvms.snmprec
new file mode 100644
index 0000000000..c28707f26a
--- /dev/null
+++ b/tests/snmpsim/openvms.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|hostname AlphaServer DS25 OpenVMS V7.3-1 Compaq TCP/IP Services for OpenVMS
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.36.2.15.22.1