diff --git a/tests/merge-conflict.bats b/tests/merge-conflict.bats
index 5b603cec74e4fbf41da941ef18a6fbf1c1c2ebaf..bf17c34ec57edba520de75f06d1807e1e6fb2aaf 100755
--- a/tests/merge-conflict.bats
+++ b/tests/merge-conflict.bats
@@ -3,7 +3,7 @@
 export PATH="$BATS_TEST_DIRNAME/../:$PATH"
 export repo="$BATS_TMPDIR/testrepo"
 
-@test "setup" {
+setup () {
     if [ ! -f "$repo/file" ]
     then
         git init "$repo"
@@ -61,6 +61,6 @@ export repo="$BATS_TMPDIR/testrepo"
     ! merge-conflict
 }
 
-@test "teardown" {
+teardown () {
     rm -rf "$repo"
 }