diff --git a/tests/spaces.bats b/tests/spaces.bats
new file mode 100644
index 0000000..7d5e2d9
--- /dev/null
+++ b/tests/spaces.bats
@@ -0,0 +1,67 @@
+#!/usr/bin/env bats
+
+function spaces_in_target_dir { #@test
+    # Time to wait for gitwatch to respond
+    # shellcheck disable=SC2034
+    WAITTIME=4
+    # Set up directory structure and initialize remote
+    testdir=$(mktemp -d "/tmp/tmp space.XXXXXXX")
+    # shellcheck disable=SC2164
+    cd "$testdir"
+    mkdir remote
+    # shellcheck disable=SC2164
+    cd remote
+    git init -q --bare
+    # shellcheck disable=SC2103
+    cd ..
+    # shellcheck disable=SC2164
+    mkdir local
+    # shellcheck disable=SC2164
+    cd local
+    git clone -q ../remote
+
+    # 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"* ]]
+
+    echo '# Teardown started' >&3
+    # Remove testing directories
+    # shellcheck disable=SC2164
+    cd /tmp
+
+    # Kill background process
+    kill -9 %1
+    fg
+
+    # Also make sure to kill fswatch if on Mac
+    killall fswatch
+    # Make sure gitwatch script gets killed if script stopped background
+    # Must kill the entire tree of processes generated
+    pkill -15 -P "$GITWATCH_PID"
+
+    echo '# Teardown complete' >&3
+}
+