diff --git a/tests/commit.bats b/tests/commit.bats
index 5333cac..2491b05 100644
--- a/tests/commit.bats
+++ b/tests/commit.bats
@@ -33,9 +33,16 @@ setup() {
     export INPUT_TAGGING_MESSAGE=""
     export INPUT_PUSH_OPTIONS=""
     export INPUT_SKIP_DIRTY_CHECK=false
+
+    skipIfNot "$BATS_TEST_DESCRIPTION"
+
+    if [ -z "$TEST_FUNCTION" ]; then
+        shellmock_clean
+    fi
 }
 
 teardown() {
+
     if [ -z "$TEST_FUNCTION" ]; then
         shellmock_clean
     fi