diff --git a/test/test_colors.tavern.yaml b/test/test_colors.tavern.yaml
index dd8a7d35..172fff36 100644
--- a/test/test_colors.tavern.yaml
+++ b/test/test_colors.tavern.yaml
@@ -70,7 +70,7 @@ marks:
   - parametrize:
       key: obj
       vals:
-        - cb
+        - checkbox
         - btn
 
 stages:
@@ -88,13 +88,13 @@ stages:
     mqtt_publish:
       topic: hasp/{plate}/command
       payload: "p[1].b[0].bg_color={color}"
-    delay_after: 0.1
+    delay_after: 0.02
 
   - name: Clear page
     mqtt_publish:
       topic: hasp/{plate}/command/clearpage
       payload: ""
-    delay_after: 0.2
+    delay_after: 0.02
 
   - name: Create object
     mqtt_publish:
@@ -106,13 +106,13 @@ stages:
         r: !int "{r:d}"
         g: !int "{g:d}"
         b: !int "{b:d}"
-    delay_after: 0.1
+    delay_after: 0.02
 
   - name: Set bg_color
     mqtt_publish:
       topic: hasp/{plate}/command
       payload: "p[1].b[0].bg_color={rgb565}"
-    delay_after: 0.1
+    delay_after: 0.02
 
   - name: Test named COLOR
     mqtt_publish:
diff --git a/test/test_label.tavern.yaml b/test/test_label.tavern.yaml
index fa995d2b..f5dace3d 100644
--- a/test/test_label.tavern.yaml
+++ b/test/test_label.tavern.yaml
@@ -12,7 +12,7 @@ paho-mqtt: &mqtt_spec
   connect:
     host: "{host}"
     port: !int "{port:d}"
-    timeout: 3
+    timeout: 1
 
 stages:
   - name: Page 1
@@ -23,13 +23,13 @@ stages:
       topic: hasp/{plate}/state/page
       payload: "1"
       timeout: 1
-    delay_after: 0.1
+    delay_after: 0.02
 
   - name: Clear page
     mqtt_publish:
       topic: hasp/{plate}/command/clearpage
       payload: ""
-    delay_after: 0.1
+    delay_after: 0.02
 
   - name: Create object
     mqtt_publish:
@@ -37,13 +37,13 @@ stages:
       json:
         objid: 12
         id: 1
-    delay_after: 0.1
+    delay_after: 0.02
 
   - name: Set x
     mqtt_publish:
       topic: hasp/{plate}/command
       payload: "p1b1.x=50"
-    delay_after: 0.1
+    delay_after: 0.02
   - name: Get x
     mqtt_publish:
       topic: hasp/{plate}/command
@@ -71,7 +71,7 @@ stages:
     mqtt_publish:
       topic: hasp/{plate}/command
       payload: "p1b1.y=50"
-    delay_after: 0.1
+    delay_after: 0.02
   - name: Get y
     mqtt_publish:
       topic: hasp/{plate}/command
@@ -85,7 +85,7 @@ stages:
     mqtt_publish:
       topic: hasp/{plate}/command
       payload: "p1b1.y=25"
-    delay_after: 0.1
+    delay_after: 0.02
   - name: Get y
     mqtt_publish:
       topic: hasp/{plate}/command
@@ -100,7 +100,7 @@ stages:
     mqtt_publish:
       topic: hasp/{plate}/command
       payload: "p1b1.w=50"
-    delay_after: 0.1
+    delay_after: 0.02
   - name: Get w
     mqtt_publish:
       topic: hasp/{plate}/command
@@ -128,7 +128,7 @@ stages:
     mqtt_publish:
       topic: hasp/{plate}/command
       payload: "p1b1.h=50"
-    delay_after: 0.1
+    delay_after: 0.02
   - name: Get h
     mqtt_publish:
       topic: hasp/{plate}/command
@@ -142,7 +142,7 @@ stages:
     mqtt_publish:
       topic: hasp/{plate}/command
       payload: "p1b1.h=25"
-    delay_after: 0.1
+    delay_after: 0.02
   - name: Get h
     mqtt_publish:
       topic: hasp/{plate}/command
@@ -157,7 +157,7 @@ stages:
     mqtt_publish:
       topic: hasp/{plate}/command
       payload: "p1b1.mode=crop"
-    delay_after: 0.1
+    delay_after: 0.02
   - name: Get mode
     mqtt_publish:
       topic: hasp/{plate}/command
@@ -167,7 +167,7 @@ stages:
     mqtt_publish:
       topic: hasp/{plate}/command
       payload: "p1b1.w=50"
-    delay_after: 0.1
+    delay_after: 0.02
   - name: Get w
     mqtt_publish:
       topic: hasp/{plate}/command
@@ -195,7 +195,7 @@ stages:
     mqtt_publish:
       topic: hasp/{plate}/command
       payload: "p1b1.h=50"
-    delay_after: 0.1
+    delay_after: 0.02
   - name: Get h
     mqtt_publish:
       topic: hasp/{plate}/command
@@ -209,7 +209,7 @@ stages:
     mqtt_publish:
       topic: hasp/{plate}/command
       payload: "p1b1.h=45"
-    delay_after: 0.1
+    delay_after: 0.02
   - name: Get h
     mqtt_publish:
       topic: hasp/{plate}/command
@@ -224,7 +224,7 @@ stages:
     mqtt_publish:
       topic: hasp/{plate}/command
       payload: "p1b1.enabled=0"
-    delay_after: 0.1
+    delay_after: 0.02
   - name: Get enabled
     mqtt_publish:
       topic: hasp/{plate}/command
@@ -238,7 +238,7 @@ stages:
     mqtt_publish:
       topic: hasp/{plate}/command
       payload: "p1b1.enabled=1"
-    delay_after: 0.1
+    delay_after: 0.02
   - name: Get enabled
     mqtt_publish:
       topic: hasp/{plate}/command
@@ -253,7 +253,7 @@ stages:
     mqtt_publish:
       topic: hasp/{plate}/command
       payload: "p1b1.hidden=1"
-    delay_after: 0.1
+    delay_after: 0.02
   - name: Get hidden
     mqtt_publish:
       topic: hasp/{plate}/command
@@ -277,7 +277,7 @@ stages:
     mqtt_publish:
       topic: hasp/{plate}/command
       payload: "p1b1.hidden=0"
-    delay_after: 0.1
+    delay_after: 0.02
   - name: Get hidden
     mqtt_publish:
       topic: hasp/{plate}/command
@@ -301,7 +301,7 @@ stages:
     mqtt_publish:
       topic: hasp/{plate}/command
       payload: "p1b1.vis=0"
-    delay_after: 0.1
+    delay_after: 0.02
   - name: Get hidden
     mqtt_publish:
       topic: hasp/{plate}/command
@@ -325,7 +325,7 @@ stages:
     mqtt_publish:
       topic: hasp/{plate}/command
       payload: "p1b1.vis=1"
-    delay_after: 0.1
+    delay_after: 0.02
   - name: Get hidden
     mqtt_publish:
       topic: hasp/{plate}/command