diff --git a/avocado/test.py b/avocado/test.py
index 36aa8e6ee3a0a7ca92675123c4b50dd605dfab07..007f6e6c52247c6c2f3ab0aa52200722b0c28ead 100644
--- a/avocado/test.py
+++ b/avocado/test.py
@@ -430,6 +430,9 @@ class Test(unittest.TestCase):
                 log_exc_info(sys.exc_info())
                 cleanup_exception = details
 
+        whiteboard_file = os.path.join(self.logdir, 'whiteboard')
+        io.write_file(whiteboard_file, self.whiteboard)
+
         if self.job is not None:
             job_standalone = self.job.args is None
             no_record_mode = (not job_standalone and