diff --git a/tests/zcommit.bats b/tests/zcommit.bats
new file mode 100644
index 0000000..a3ee2ac
--- /dev/null
+++ b/tests/zcommit.bats
@@ -0,0 +1,38 @@
+#!/usr/bin/env bats
+
+# This is a testscript using the bats testing framework:
+# https://github.com/sstephenson/bats
+# To run it, at a command prompt:
+# bats testscript.bats
+
+load startup-shutdown
+
+function zcommit_log_messages_working { #@test
+    # Start up gitwatch with logging, see if works
+    "${BATS_TEST_DIRNAME}"/../gitwatch.sh -l 10 "$testdir/local/remote" 3>&- &
+    GITWATCH_PID=$!
+
+    # Keeps kill message from printing to screen
+    disown
+
+    # Create a file, verify that it hasn't been added yet, then commit
+    cd remote
+
+    # According to inotify documentation, a race condition results if you write
+    # to directory too soon after it has been created; hence, a short wait.
+    sleep 1
+    echo "line1" >> file1.txt
+
+    # Wait a bit for inotify to figure out the file has changed, and do its add,
+    # and commit
+    sleep "$WAITTIME"
+
+    # Make a new change
+    echo "line2" >> file1.txt
+    sleep "$WAITTIME"
+
+    # Check commit log that the diff is in there
+    run git log -1 --oneline
+    [[ $output == *"file1.txt"* ]]
+}
+