diff --git a/functional-tests/run-tests.scm b/functional-tests/run-tests.scm
index 805a3a1..a6cfa11 100644
--- a/functional-tests/run-tests.scm
+++ b/functional-tests/run-tests.scm
@@ -1,10 +1,8 @@
 (import (rnrs)
         (test-runner)
         (cache-functional-tests)
-        (era-functional-tests)
-        (thin-functional-tests))
+        (era-functional-tests))
 
-(register-thin-tests)
 (register-cache-tests)
 (register-era-tests)
 
diff --git a/functional-tests/test-runner.scm b/functional-tests/test-runner.scm
index b21f5f9..bad24de 100644
--- a/functional-tests/test-runner.scm
+++ b/functional-tests/test-runner.scm
@@ -14,8 +14,7 @@
           (only (srfi s1 lists) break)
           (regex)
           (srfi s8 receive)
-          (temp-file)
-          (thin-functional-tests))
+          (temp-file))
 
   ;;------------------------------------------------
 
diff --git a/functional-tests/thin-functional-tests.scm b/functional-tests/thin-functional-tests.scm
deleted file mode 100644
index 0f2fd09..0000000
--- a/functional-tests/thin-functional-tests.scm
+++ /dev/null
@@ -1,132 +0,0 @@
-(library
-  (thin-functional-tests)
-
-  (export register-thin-tests)
-
-  (import
-    (chezscheme)
-    (bcache block-manager)
-    (disk-units)
-    (fmt fmt)
-    (functional-tests)
-    (process)
-    (scenario-string-constants)
-    (temp-file)
-    (thin xml)
-    (srfi s8 receive))
-
-  (define-tool thin-check)
-  (define-tool thin-delta)
-  (define-tool thin-dump)
-  (define-tool thin-restore)
-  (define-tool thin-rmap)
-  (define-tool thin-repair)
-  (define-tool thin-metadata-pack)
-  (define-tool thin-metadata-unpack)
-
-  (define-syntax with-thin-xml
-    (syntax-rules ()
-      ((_ (v) b1 b2 ...)
-       (with-temp-file-containing ((v "thin.xml" (fmt #f (generate-xml 10 1000))))
-                                  b1 b2 ...))))
-
-  (define-syntax with-valid-metadata
-    (syntax-rules ()
-      ((_ (md) b1 b2 ...)
-       (with-temp-file-sized ((md "thin.bin" (meg 4)))
-         (with-thin-xml (xml)
-           (run-ok (thin-restore "-i" xml "-o" md))
-           b1 b2 ...)))))
-
-  ;;; It would be nice if the metadata was at least similar to valid data.
-  ;;; Here I'm just using the start of the ls binary as 'random' data.
-  (define-syntax with-corrupt-metadata
-    (syntax-rules ()
-      ((_ (md) b1 b2 ...)
-       (with-temp-file-sized ((md "thin.bin" (meg 4)))
-         (system (fmt #f "dd if=/usr/bin/ls of=" md " bs=4096 > /dev/null 2>&1"))
-         b1 b2 ...))))
-
-  (define-syntax with-empty-metadata
-    (syntax-rules ()
-      ((_ (md) b1 b2 ...)
-       (with-temp-file-sized ((md "thin.bin" (meg 4)))
-                             b1 b2 ...))))
-
-  (define (damage-superblock md)
-    (system (string-append "dd if=/dev/zero of=" md " bs=4K count=1 conv=notrunc > /dev/null 2>&1")))
-
-  (define-syntax with-damaged-superblock
-    (syntax-rules ()
-      ((_ (md) b1 b2 ...)
-       (with-valid-metadata (md)
-         (damage-superblock md)
-         b1 b2 ...))))
-
-  ;; We have to export something that forces all the initialisation expressions
-  ;; to run.
-  (define (register-thin-tests) #t)
-
-  ;;;-----------------------------------------------------------
-  ;;; thin_metadata_unpack scenarios
-  ;;;-----------------------------------------------------------
-  (define-scenario (thin-metadata-unpack version)
-    "accepts --version"
-    (run-ok-rcv (stdout _) (thin-metadata-unpack "--version")
-      (assert-equal "thin_metadata_unpack 0.9.0-rc2" stdout)))
-
-  (define-scenario (thin-metadata-unpack h)
-    "accepts -h"
-    (run-ok-rcv (stdout _) (thin-metadata-unpack "-h")
-      (assert-equal thin-metadata-unpack-help stdout)))
-
-  (define-scenario (thin-metadata-unpack help)
-    "accepts --help"
-    (run-ok-rcv (stdout _) (thin-metadata-unpack "--help")
-      (assert-equal thin-metadata-unpack-help stdout)))
-
-  (define-scenario (thin-metadata-unpack unrecognised-option)
-    "Unrecognised option should cause failure"
-    (with-valid-metadata (md)
-      (run-fail-rcv (stdout stderr) (thin-metadata-unpack "--unleash-the-hedgehogs")
-        (assert-starts-with "error: Found argument '--unleash-the-hedgehogs'" stderr)))) 
-
-  (define-scenario (thin-metadata-unpack missing-input-file)
-    "the input file wasn't specified"
-    (with-empty-metadata (md)
-      (run-fail-rcv (_ stderr) (thin-metadata-unpack "-o " md)
-        (assert-starts-with "error: The following required arguments were not provided:\n    -i <DEV>" stderr))))
-
-  (define-scenario (thin-metadata-unpack no-such-input-file)
-    "the input file can't be found"
-    (with-empty-metadata (md)
-      (run-fail-rcv (_ stderr) (thin-metadata-unpack "-i no-such-file -o" md)
-        (assert-starts-with "Couldn't find input file" stderr))))
-
-  (define-scenario (thin-metadata-unpack missing-output-file)
-    "the output file wasn't specified"
-    (with-empty-metadata (md)
-      (run-fail-rcv (_ stderr) (thin-metadata-unpack "-i" md)
-        (assert-starts-with "error: The following required arguments were not provided:\n    -o <FILE>" stderr))))
-
-  (define-scenario (thin-metadata-unpack garbage-input-file)
-    "the input file is just zeroes"
-    (with-empty-metadata (bad-pack)
-      (run-fail-rcv (_ stderr) (thin-metadata-unpack "-i " bad-pack "-o junk")
-        (assert-starts-with "Not a pack file." stderr))))
-
-  ;;;-----------------------------------------------------------
-  ;;; thin_metadata_pack/unpack end to end scenario
-  ;;;-----------------------------------------------------------)
-  (define-scenario (thin-metadata-pack end-to-end)
-    "pack -> unpack recovers metadata"
-    (let ((pack-file "md.pack"))
-      (with-valid-metadata (md-in)
-        (with-empty-metadata (md-out)
-          (run-ok (thin-metadata-pack "-i" md-in "-o" pack-file))
-          (run-ok (thin-metadata-unpack "-i" pack-file "-o" md-out))
-            (run-ok-rcv (dump1 _) (thin-dump md-in)
-              (run-ok-rcv (dump2 _) (thin-dump md-out)
-                (assert-equal dump1 dump2)))))))
-
-)
diff --git a/tests/thin_metadata_unpack.rs b/tests/thin_metadata_unpack.rs
new file mode 100644
index 0000000..057e147
--- /dev/null
+++ b/tests/thin_metadata_unpack.rs
@@ -0,0 +1,99 @@
+use anyhow::Result;
+use thinp::version::TOOLS_VERSION;
+
+mod common;
+use common::*;
+
+//------------------------------------------
+
+#[test]
+fn accepts_v() -> Result<()> {
+    let stdout = thin_metadata_unpack!("-V").read()?;
+    assert!(stdout.contains(TOOLS_VERSION));
+    Ok(())
+}
+
+#[test]
+fn accepts_version() -> Result<()> {
+    let stdout = thin_metadata_unpack!("--version").read()?;
+    assert!(stdout.contains(TOOLS_VERSION));
+    Ok(())
+}
+
+const USAGE: &str = "thin_metadata_unpack 0.9.0-rc2\nUnpack a compressed file of thin metadata.\n\nUSAGE:\n    thin_metadata_unpack -i <DEV> -o <FILE>\n\nFLAGS:\n    -h, --help       Prints help information\n    -V, --version    Prints version information\n\nOPTIONS:\n    -i <DEV>         Specify thinp metadata binary device/file\n    -o <FILE>        Specify packed output file";
+
+#[test]
+fn accepts_h() -> Result<()> {
+    let stdout = thin_metadata_unpack!("-h").read()?;
+    assert_eq!(stdout, USAGE);
+    Ok(())
+}
+
+#[test]
+fn accepts_help() -> Result<()> {
+    let stdout = thin_metadata_unpack!("--help").read()?;
+    assert_eq!(stdout, USAGE);
+    Ok(())
+}
+
+#[test]
+fn rejects_bad_option() -> Result<()> {
+    let stderr = run_fail(thin_metadata_unpack!("--hedgehogs-only"))?;
+    assert!(stderr.contains("Found argument \'--hedgehogs-only\'"));
+    Ok(())
+}
+
+#[test]
+fn missing_input_file() -> Result<()> {
+    let mut td = TestDir::new()?;
+    let md = mk_zeroed_md(&mut td)?;
+    let stderr = run_fail(thin_metadata_unpack!("-o", &md))?;
+    assert!(
+        stderr.contains("error: The following required arguments were not provided:\n    -i <DEV>")
+    );
+    Ok(())
+}
+
+#[test]
+fn no_such_input_file() -> Result<()> {
+    let mut td = TestDir::new()?;
+    let md = mk_zeroed_md(&mut td)?;
+    let stderr = run_fail(thin_metadata_unpack!("-i", "no-such-file", "-o", &md))?;
+    assert!(stderr.contains("Couldn't find input file"));
+    Ok(())
+}
+
+#[test]
+fn missing_output_file() -> Result<()> {
+    let mut td = TestDir::new()?;
+    let md = mk_zeroed_md(&mut td)?;
+    let stderr = run_fail(thin_metadata_unpack!("-i", &md))?;
+    assert!(stderr
+        .contains("error: The following required arguments were not provided:\n    -o <FILE>"));
+    Ok(())
+}
+
+#[test]
+fn garbage_input_file() -> Result<()> {
+    let mut td = TestDir::new()?;
+    let md = mk_zeroed_md(&mut td)?;
+    let stderr = run_fail(thin_metadata_unpack!("-i", &md, "-o", "junk"))?;
+    assert!(stderr.contains("Not a pack file."));
+    Ok(())
+}
+
+#[test]
+fn end_to_end() -> Result<()> {
+    let mut td = TestDir::new()?;
+    let md_in = mk_valid_md(&mut td)?;
+    let md_out = mk_zeroed_md(&mut td)?;
+    thin_metadata_pack!("-i", &md_in, "-o", "meta.pack").run()?;
+    thin_metadata_unpack!("-i", "meta.pack", "-o", &md_out).run()?;
+
+    let dump1 = thin_dump!(&md_in).read()?;
+    let dump2 = thin_dump!(&md_out).read()?;
+    assert_eq!(dump1, dump2);
+    Ok(())
+}
+
+//------------------------------------------