diff --git a/tests/main.lisp b/tests/main.lisp
index 44d7cae..9fd3aa1 100644
--- a/tests/main.lisp
+++ b/tests/main.lisp
@@ -58,7 +58,7 @@
 ;;; Usually, these updates are logged when each device is either just
 ;;; finished powering up or as they are about to power down.
 
-(fiveam:test factory-1-light-status-data
+(fiveam:test factory-1-status-data
   :description "Validates the (status) data produced by `FACTORY1'."
   (let ((data (ritherdon-rest:parse-request "/status/latest/1")))
     ;; Data should look something like:
@@ -74,7 +74,7 @@
     (is (equal t (or (string-equal (cdr (car (cdr data))) "off")
 		     (string-equal (cdr (car (cdr data))) "on"))))))
 
-(fiveam:test factory-2-light-status-data
+(fiveam:test factory-2-status-data
   :description "Validates the (status) data produced by `FACTORY2'."
   (let ((data (ritherdon-rest:parse-request "/status/latest/2")))
     ;; Data should look something like:
@@ -90,7 +90,7 @@
     (is (equal t (or (string-equal (cdr (car (cdr data))) "off")
 		     (string-equal (cdr (car (cdr data))) "on"))))))
 
-(fiveam:test factory-3-light-status-data
+(fiveam:test factory-3-status-data
   :description "Validates the (status) data produced by `FACTORY3'."
   (let ((data (ritherdon-rest:parse-request "/status/latest/3")))
     ;; Ritherdon has a third welding booth but it was not included in