diff --git a/lib/installedtest.pm b/lib/installedtest.pm
index 1e098463..e61b5d06 100644
--- a/lib/installedtest.pm
+++ b/lib/installedtest.pm
@@ -23,6 +23,13 @@ sub root_console {
 sub post_fail_hook {
     my $self = shift;
 
+    # if we failed at a browser certificate error screen, click to get
+    # more info on the issue
+    if (check_screen 'browser_certificate_error', 3) {
+        assert_and_click 'browser_certificate_error';
+        save_screenshot;
+    }
+
     if (check_screen 'emergency_rescue', 3) {
         my $password = get_var("ROOT_PASSWORD", "weakpassword");
         type_string "$password\n";
diff --git a/needles/firefox/firefox_certificate_error-20190221.json b/needles/firefox/firefox_certificate_error-20190221.json
new file mode 100644
index 00000000..dd6e77ac
--- /dev/null
+++ b/needles/firefox/firefox_certificate_error-20190221.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 801,
+      "ypos": 506,
+      "width": 75,
+      "height": 19,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "browser_certificate_error",
+    "firefox_certificate_error"
+  ]
+}
\ No newline at end of file
diff --git a/needles/firefox/firefox_certificate_error-20190221.png b/needles/firefox/firefox_certificate_error-20190221.png
new file mode 100644
index 00000000..c395dcb2
Binary files /dev/null and b/needles/firefox/firefox_certificate_error-20190221.png differ