diff --git a/providers/base/units/camera/jobs.pxu b/providers/base/units/camera/jobs.pxu
index ac5348d8e6..37be1dc695 100644
--- a/providers/base/units/camera/jobs.pxu
+++ b/providers/base/units/camera/jobs.pxu
@@ -118,10 +118,12 @@ _summary: Webcam brisque score for {{ product_slug }}
 estimated_duration: 20s
 depends: camera/detect
 command:
-  camera_quality_test.py -d {{ name }}
+  timeout 120 camera_quality_test.py -d {{ name }} || 
+  (>&2 echo "Timeout computing score"; false)
 _description:
-  Takes multiple pictures and computes the quality based on a No-Reference image
-  quality assessment algorithm called BRISQUE.
+  Takes a picture and computes the quality based on a No-Reference image
+  quality assessment algorithm called BRISQUE. This test will timeout and fail
+  if the quality has not been compute within 120 seconds.
 
 unit: template
 template-resource: device
diff --git a/providers/base/units/camera/test-plan.pxu b/providers/base/units/camera/test-plan.pxu
index 450e638bfe..57c6a53ceb 100644
--- a/providers/base/units/camera/test-plan.pxu
+++ b/providers/base/units/camera/test-plan.pxu
@@ -36,7 +36,7 @@ _description: Camera tests (automated)
 include:
  camera/detect                                     certification-status=blocker
  camera/multiple-resolution-images_.*              certification-status=blocker
- camera/camera-quality_.*                           certification-status=non-blocker
+ camera/camera-quality_.*                          certification-status=non-blocker
 bootstrap_include:
  device