diff --git a/providers/base/units/monitor/jobs.pxu b/providers/base/units/monitor/jobs.pxu
index b339c58b33..977e962200 100644
--- a/providers/base/units/monitor/jobs.pxu
+++ b/providers/base/units/monitor/jobs.pxu
@@ -79,7 +79,7 @@ _steps:
     2. Switch display modes within your Display Settings, check if it can be
     set to mirrored, extended, displayed on external or onboard only.
 _verification:
-    Was the desktop displayed correctly with {vendor} {product} on the HDMI-connected 
+    Was the desktop displayed correctly with {vendor} {product} on the HDMI-connected
     screen in every mode?
 _summary: Check HDMI port functionality as a monitor interconnect for {vendor} {product}.
 
@@ -225,7 +225,7 @@ _steps:
     2. Switch display modes between in your Display Settings, check if it can be
        set to mirrored, extended, displayed on external or onboard only
 _verification:
-    Was the desktop displayed correctly with {vendor} {product} on the Thunderbolt-connected 
+    Was the desktop displayed correctly with {vendor} {product} on the Thunderbolt-connected
     screen in every mode?
 
 unit: template
@@ -248,7 +248,7 @@ _steps:
     2. Switch display modes between in your Display Settings, check if it can be
        set to mirrored, extended, displayed on external or onboard only
 _verification:
-    Was the desktop displayed correctly with {vendor} {product} on the Thunderbolt-connected 
+    Was the desktop displayed correctly with {vendor} {product} on the Thunderbolt-connected
     screen in every mode?
 
 unit: template
@@ -459,6 +459,22 @@ _verification:
      Was the interface displayed correctly on the screen?
 flags: also-after-suspend
 
+id: monitor/hdmi_hotplug
+_summary: Can hotplug monitor (HDMI)
+plugin: manual
+category_id: com.canonical.plainbox::monitor
+imports: from com.canonical.plainbox import manifest
+requires: manifest.has_hdmi == 'True'
+_purpose:
+     This test will check the HDMI port and the ability to do hotplugging.
+_steps:
+     Skip this test if your system does not have a HDMI port.
+     1. If a display is already connected, unplug it.
+     2. (Re-)Connect a display to the HDMI port on your system
+_verification:
+     Was the interface displayed correctly on the screen?
+flags: also-after-suspend
+
 id: monitor/vga
 _summary: Monitor works (VGA)
 _purpose:
diff --git a/providers/base/units/monitor/test-plan.pxu b/providers/base/units/monitor/test-plan.pxu
index 15607ef6a1..8c3a8bb6e6 100644
--- a/providers/base/units/monitor/test-plan.pxu
+++ b/providers/base/units/monitor/test-plan.pxu
@@ -364,6 +364,7 @@ include:
     monitor/dvi-to-vga
     monitor/hdmi-to-vga
     monitor/displayport_hotplug  certification-status=blocker
+    monitor/hdmi_hotplug         certification-status=blocker
     monitor/vga
 
 id: after-suspend-monitor-full