diff --git a/functional-tests/cache-functional-tests.scm b/functional-tests/cache-functional-tests.scm
index 52a9496..2988d89 100644
--- a/functional-tests/cache-functional-tests.scm
+++ b/functional-tests/cache-functional-tests.scm
@@ -326,5 +326,4 @@
     (receive (stdout stderr) (cache-metadata-size "--nr-blocks 67108864")
       (assert-equal "3678208 sectors" stdout)
       (assert-eof stderr)))
-
-  )
+)
diff --git a/functional-tests/functional-tests.scm b/functional-tests/functional-tests.scm
index 61f767d..063be20 100644
--- a/functional-tests/functional-tests.scm
+++ b/functional-tests/functional-tests.scm
@@ -28,7 +28,6 @@
     (logging)
     (process)
     (temp-file)
-    (thin-xml)
     (utils)
     (srfi s8 receive))
 
diff --git a/functional-tests/thin-functional-tests.scm b/functional-tests/thin-functional-tests.scm
index 3386171..04332e3 100644
--- a/functional-tests/thin-functional-tests.scm
+++ b/functional-tests/thin-functional-tests.scm
@@ -11,7 +11,7 @@
     (process)
     (scenario-string-constants)
     (temp-file)
-    (thin-xml)
+    (thin xml)
     (srfi s8 receive))
 
   (define-tool thin-check)
@@ -253,7 +253,9 @@
 
   (define-scenario (thin-delta unrecognised-option)
     "Unrecognised option should cause failure"
-    (run-fail "thin_delta --unleash-the-hedgehogs"))
+    (with-valid-metadata (md)
+      (receive (stdout stderr) (run-fail "thin_delta --unleash-the-hedgehogs")
+        (assert-starts-with "thin_delta: unrecognized option '--unleash-the-hedgehogs" stderr))))
 
   (define-scenario (thin-delta snap1-unspecified)
     "Fails without --snap1 fails"