diff --git a/build.wake b/build.wake
index e9dfbe64c..3f0c59513 100644
--- a/build.wake
+++ b/build.wake
@@ -91,6 +91,7 @@ def bootstrapTarget targetFn variant =
 # Build all wake targets
 def targets =
     buildWake,
+    buildWakeUnit,
     buildWakeBox,
     buildFuseDaemon,
     buildShim,
diff --git a/tests/wunit/pass.sh b/tests/wunit/pass.sh
new file mode 100755
index 000000000..1471d4c19
--- /dev/null
+++ b/tests/wunit/pass.sh
@@ -0,0 +1,19 @@
+#! /bin/sh
+
+set -e
+
+function cleanup {
+    rm -rf job_cache_test
+    rm -rf .job_cache_test
+    rm -rf job_cache_test2
+    rm -rf .job_cache_test2
+}
+trap cleanup EXIT
+
+WAKE_UNIT="${1}/wake-unit"
+
+TERM=xterm-256color script --return --quiet -c "$WAKE_UNIT --no-color --tag threaded" /dev/null
+
+# We run the tests *twice* so that shared caching can run without a clean slate
+TERM=xterm-256color script --return --quiet -c "$WAKE_UNIT --no-color --tag threaded" /dev/null > /dev/null
+
diff --git a/tests/wunit/stderr b/tests/wunit/stderr
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/wunit/stdout b/tests/wunit/stdout
new file mode 100644
index 000000000..be1ccf226
--- /dev/null
+++ b/tests/wunit/stdout
@@ -0,0 +1,108 @@
+PASSED:
+  cli_options_basic
+  cli_options_shebang
+  cli_options_target
+  cli_options_timline
+  diff_add
+  diff_empty
+  diff_fuzz1
+  diff_fuzz2
+  diff_fuzz3
+  diff_id
+  diff_permute
+  diff_sub
+  diff_unit_diff
+  diff_unit_same
+  doc_basic
+  doc_geometry
+  doc_large
+  doc_undo
+  doc_unicode
+  filepath_dir_range_basic
+  filepath_dir_range_empty
+  filepath_make_canonical
+  filepath_range_basic
+  filepath_range_empty_node
+  filepath_range_fuzz_garbage
+  filepath_range_fuzz_nice
+  filepath_range_no_node
+  filepath_range_one_node
+  filepath_range_only_slash
+  filepath_range_two_slash
+  filepath_relative_to
+  iterator_split_by_empty
+  iterator_split_by_no_delim
+  iterator_split_by_nominal
+  iterator_split_by_only_delim
+  job_cache_basic_fuzz
+  job_cache_basic_par_fuzz
+  option_assign1
+  option_assign2
+  option_copy
+  option_destructs
+  option_forward
+  option_inplace
+  option_move
+  option_no_construct
+  option_none_is_none
+  option_some
+  result_assign1
+  result_assign2
+  result_copy
+  result_destructs
+  result_err_is_err
+  result_forward_error
+  result_forward_value
+  result_inplace_error
+  result_inplace_value
+  result_move
+  result_no_construct
+  result_value
+  sanity_check1
+  sanity_check2
+  shell_escape_empty_string
+  shell_escape_nominal
+  shell_escape_spaces
+  shell_escape_special
+  term_basic_background_colors
+  term_basic_background_colors_dumb
+  term_basic_bold_background_colors
+  term_basic_bold_background_colors_dumb
+  term_basic_bold_foreground_colors
+  term_basic_bold_foreground_colors_dumb
+  term_basic_controls
+  term_basic_controls_dumb
+  term_basic_foreground_colors
+  term_basic_foreground_colors_dumb
+  term_basic_ignores
+  term_basic_intense_background_colors
+  term_basic_intense_foreground_colors
+  term_basic_resets
+  term_basic_resets_dumb
+  term_dumb_fuzz
+  term_dumb_gcc_smoke_test
+  term_dumb_git_smoke_test
+  term_dumb_unicode_smoke_test
+  term_gcc_smoke_test
+  term_git_smoke_test
+  term_rich_background_colors
+  term_rich_background_colors_dumb
+  term_rich_foreground_colors
+  term_rich_foreground_colors_dumb
+  term_unicode_smoke_test
+  trie_basic
+  trie_basic_const
+  trie_char
+  trie_empty_seq
+  trie_empty_seq_const
+  trie_fuzz
+  trie_long_seq
+  trie_max
+  trie_max_const
+  trie_string
+  trie_unique
+  trie_unit_seqs
+  trie_unit_seqs_const
+
+
+SUCCESS
diff --git a/wake.spec.in b/wake.spec.in
index 9e91988e9..94cca2639 100644
--- a/wake.spec.in
+++ b/wake.spec.in
@@ -38,6 +38,7 @@ mkdir -p %{buildroot}/var/cache/wake
 /usr/bin/wake-rsc-tool
 /usr/bin/wake-format
 /usr/bin/job-cache
+/usr/bin/wake-unit
 /usr/lib/wake
 /usr/share/wake
 %dir /var/cache/wake