diff --git a/artiq/test/worker.py b/artiq/test/worker.py
index 5d3aad34d..80e76735a 100644
--- a/artiq/test/worker.py
+++ b/artiq/test/worker.py
@@ -4,7 +4,7 @@ import sys
 from time import sleep
 
 from artiq import *
-from artiq.master.worker import * 
+from artiq.master.worker import *
 
 
 class WatchdogNoTimeout(Experiment, AutoDB):
@@ -20,6 +20,15 @@ class WatchdogTimeout(Experiment, AutoDB):
             sleep(100.0)
 
 
+class WatchdogTimeoutInBuild(Experiment, AutoDB):
+    def build(self):
+        with self.scheduler.watchdog(0.1*s):
+            sleep(100.0)
+
+    def run(self):
+        pass
+
+
 @asyncio.coroutine
 def _call_worker(worker, run_params):
     yield from worker.prepare(0, run_params)
@@ -52,3 +61,7 @@ class WatchdogCase(unittest.TestCase):
     def test_watchdog_timeout(self):
         with self.assertRaises(WorkerWatchdogTimeout):
             _run_experiment("WatchdogTimeout")
+
+    def test_watchdog_timeout_in_build(self):
+        with self.assertRaises(WorkerWatchdogTimeout):
+            _run_experiment("WatchdogTimeoutInBuild")