diff --git a/test/cli/CMakeLists.txt b/test/cli/CMakeLists.txt
index bb7eee8..a4ea8ad 100644
--- a/test/cli/CMakeLists.txt
+++ b/test/cli/CMakeLists.txt
@@ -9,7 +9,7 @@
 set(LEGACY_TEST_TREE "${CMAKE_CURRENT_BINARY_DIR}/test-artifacts")
 set(GIT_WIP_BIN "$<TARGET_FILE:git-wip>")
 
-foreach(TEST_NAME IN ITEMS test_legacy test_spaces test_status test_status2 test_status_ref test_save_file test_save_subdir test_list test_delete)
+foreach(TEST_NAME IN ITEMS test_legacy test_spaces test_status test_status2 test_status_ref test_save_file test_save_subdir test_list test_delete test_help)
     add_test(
         NAME    "cli/${TEST_NAME}"
         COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.sh"
diff --git a/test/cli/test_help.sh b/test/cli/test_help.sh
new file mode 100755
index 0000000..cf9d514
--- /dev/null
+++ b/test/cli/test_help.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+
+source "$(dirname "$0")/lib.sh"
+
+create_test_repo
+
+# Test main help commands
+
+_RUN "$GIT_WIP" help 2>/dev/null
+
+EXP_grep "."
+
+_RUN "$GIT_WIP" --help 2>/dev/null
+
+EXP_grep "."
+
+_RUN "$GIT_WIP" -h 2>/dev/null
+
+EXP_grep "."
+
+_RUN "$GIT_WIP" --version 2>/dev/null
+
+EXP_grep "."
+
+# Test per-command help
+
+for cmd in save status log delete ; do
+
+  _RUN "$GIT_WIP" $cmd --help 2>/dev/null
+
+  EXP_grep "."
+
+  _RUN "$GIT_WIP" $cmd -h 2>/dev/null
+
+  EXP_grep "."
+
+done
+
+echo "OK: $TEST_NAME"
\ No newline at end of file