diff --git a/tests/commitlog.bats b/tests/commitlog.bats
index 863cbf3..b19ed74 100644
--- a/tests/commitlog.bats
+++ b/tests/commitlog.bats
@@ -7,8 +7,7 @@
 
 load startup-shutdown
 
-@test "commit log messages working"
-{
+function commit_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=$!
diff --git a/tests/remotedirs.bats b/tests/remotedirs.bats
index 302b20b..06ff64e 100644
--- a/tests/remotedirs.bats
+++ b/tests/remotedirs.bats
@@ -7,8 +7,7 @@
 
 load startup-shutdown
 
-@test "remote git dirs working, with commit logging"
-{
+function remote_git_dirs_working_with_commit_logging { #@test
     # Move .git somewhere else
     dotgittestdir=$(mktemp -d)
     mv "$testdir/local/remote/.git" "$dotgittestdir"
diff --git a/tests/status-change.bats b/tests/status-change.bats
index 5b6b8fe..7f0524c 100644
--- a/tests/status-change.bats
+++ b/tests/status-change.bats
@@ -7,8 +7,7 @@
 
 load startup-shutdown
 
-@test "commit only when git status change"
-{
+function commit_only_when_git_status_change { #@test
 
     # Start up gitwatch and capture its output
     ${BATS_TEST_DIRNAME}/../gitwatch.sh "$testdir/local/remote" > "$testdir/output.txt" 3>&- &
diff --git a/tests/sync.bats b/tests/sync.bats
index 3f40ee9..29dd969 100644
--- a/tests/sync.bats
+++ b/tests/sync.bats
@@ -7,8 +7,7 @@
 
 load startup-shutdown
 
-@test "syncing correctly"
-{
+function syncing_correctly { #@test
     # Start up gitwatch and see if commit and push happen automatically
     # after waiting two seconds
     ${BATS_TEST_DIRNAME}/../gitwatch.sh -r origin "$testdir/local/remote" 3>- &