diff --git a/includes/definitions/discovery/procurve.yaml b/includes/definitions/discovery/procurve.yaml
index a87bb41844..f4c0d000a2 100644
--- a/includes/definitions/discovery/procurve.yaml
+++ b/includes/definitions/discovery/procurve.yaml
@@ -18,6 +18,8 @@ modules:
         sysDescr_regex:
             - '/( (?<hardware>\d{4,}\S*)[^,]*)?, revision (?<version>[^ ,]+)/'
             - '/PROCURVE (?<hardware>.*) - (?<version>.*)/'
+            - '/(HPE OfficeConnect Switch|HP) (?<hardware>[\d]+[\ \-]\S+).*(?<version>P\S[0-9\.]+)/'
+            - '/(HP ProCurve) (?<hardware>\d+\S?).*(?<version>P[1-9\.]+)/'
         version:
             - NETSWITCH-MIB::hpSwitchOsVersion.0
             - HP-SN-AGENT-MIB::snAgImgVer.0
diff --git a/tests/data/procurve_131.json b/tests/data/procurve_131.json
new file mode 100644
index 0000000000..d13a1677e3
--- /dev/null
+++ b/tests/data/procurve_131.json
@@ -0,0 +1,23 @@
+{
+    "os": {
+        "discovery": {
+            "devices": [
+                {
+                    "sysName": "",
+                    "sysObjectID": ".1.3.6.1.4.1.11.2.3.7.11.131",
+                    "sysDescr": "HP J9625A 2620-24-PoEP Switch, revision RA.16.02.0012, ROM RA.15.13 (/ws/swbuildm/rel_spokane_qaoff/code/build/xform(swbuildm_rel_spokane_qaoff_rel_spokane))",
+                    "sysContact": null,
+                    "version": "RA.16.02.0012",
+                    "hardware": "2620-24-PoEP",
+                    "features": null,
+                    "os": "procurve",
+                    "type": "network",
+                    "serial": null,
+                    "icon": "hpe.svg",
+                    "location": null
+                }
+            ]
+        },
+        "poller": "matches discovery"
+    }
+}
diff --git a/tests/data/procurve_151.json b/tests/data/procurve_151.json
new file mode 100644
index 0000000000..dea3b0619f
--- /dev/null
+++ b/tests/data/procurve_151.json
@@ -0,0 +1,23 @@
+{
+    "os": {
+        "discovery": {
+            "devices": [
+                {
+                    "sysName": "",
+                    "sysObjectID": ".1.3.6.1.4.1.11.2.3.7.11.151",
+                    "sysDescr": "HP 1810-24G, PL.1.9, eCos-3.0, 1_12_8-customized-h",
+                    "sysContact": null,
+                    "version": "PL.1.9",
+                    "hardware": "1810-24G,",
+                    "features": null,
+                    "os": "procurve",
+                    "type": "network",
+                    "serial": null,
+                    "icon": "hpe.svg",
+                    "location": null
+                }
+            ]
+        },
+        "poller": "matches discovery"
+    }
+}
diff --git a/tests/data/procurve_167-hp.json b/tests/data/procurve_167-hp.json
new file mode 100644
index 0000000000..b052b2dac0
--- /dev/null
+++ b/tests/data/procurve_167-hp.json
@@ -0,0 +1,23 @@
+{
+    "os": {
+        "discovery": {
+            "devices": [
+                {
+                    "sysName": "",
+                    "sysObjectID": ".1.3.6.1.4.1.11.2.3.7.11.167",
+                    "sysDescr": "HP 1820-8G Switch J9979A, PT.01.14, Linux 3.6.5-79c95a77, U-Boot 2012.10-00116-g3ab515c (Jul 30 2014 - 10:52:01)",
+                    "sysContact": null,
+                    "version": "PT.01.14",
+                    "hardware": "1820-8G",
+                    "features": null,
+                    "os": "procurve",
+                    "type": "network",
+                    "serial": null,
+                    "icon": "hpe.svg",
+                    "location": null
+                }
+            ]
+        },
+        "poller": "matches discovery"
+    }
+}
diff --git a/tests/data/procurve_167-hpe.json b/tests/data/procurve_167-hpe.json
new file mode 100644
index 0000000000..985947aca6
--- /dev/null
+++ b/tests/data/procurve_167-hpe.json
@@ -0,0 +1,23 @@
+{
+    "os": {
+        "discovery": {
+            "devices": [
+                {
+                    "sysName": "",
+                    "sysObjectID": ".1.3.6.1.4.1.11.2.3.7.11.167",
+                    "sysDescr": "HPE OfficeConnect Switch 1820 8G J9979A, PT.02.01, Linux 3.6.5-79c95a77, U-Boot 2012.10-00116-g3ab515c (Jul 30 2014 - 10:52:01)",
+                    "sysContact": null,
+                    "version": "PT.02.01",
+                    "hardware": "1820 8G",
+                    "features": null,
+                    "os": "procurve",
+                    "type": "network",
+                    "serial": null,
+                    "icon": "hpe.svg",
+                    "location": null
+                }
+            ]
+        },
+        "poller": "matches discovery"
+    }
+}
diff --git a/tests/data/procurve_50-procurve.json b/tests/data/procurve_50-procurve.json
new file mode 100644
index 0000000000..bdf96e2d9d
--- /dev/null
+++ b/tests/data/procurve_50-procurve.json
@@ -0,0 +1,23 @@
+{
+    "os": {
+        "discovery": {
+            "devices": [
+                {
+                    "sysName": "",
+                    "sysObjectID": ".1.3.6.1.4.1.11.2.3.7.11.50",
+                    "sysDescr": "ProCurve J8697A Switch 5406zl, revision K.15.04.0007, ROM K.15.13 (/sw/code/build/btm(K_15_04))",
+                    "sysContact": null,
+                    "version": "K.15.04.0007",
+                    "hardware": "5406zl",
+                    "features": null,
+                    "os": "procurve",
+                    "type": "network",
+                    "serial": null,
+                    "icon": "hpe.svg",
+                    "location": null
+                }
+            ]
+        },
+        "poller": "matches discovery"
+    }
+}