diff --git a/tests/flags/warning on non-test filename/.chainsaw/successful test b/tests/flags/filepath/.chainsaw/successful test
similarity index 100%
rename from tests/flags/warning on non-test filename/.chainsaw/successful test
rename to tests/flags/filepath/.chainsaw/successful test
diff --git a/tests/flags/warning on non-test filename/.test/successful test b/tests/flags/filepath/.test/successful test
similarity index 100%
rename from tests/flags/warning on non-test filename/.test/successful test
rename to tests/flags/filepath/.test/successful test
diff --git a/tests/flags/warning on non-test filename/no molly guard if named test b/tests/flags/filepath/no molly guard if named test
similarity index 100%
rename from tests/flags/warning on non-test filename/no molly guard if named test
rename to tests/flags/filepath/no molly guard if named test
diff --git a/tests/flags/filepath/no molly guard if test in path b/tests/flags/filepath/no molly guard if test in path
new file mode 100755
index 0000000..513203e
--- /dev/null
+++ b/tests/flags/filepath/no molly guard if test in path	
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+../../../urchin .foo
diff --git a/tests/flags/warning on non-test filename/override b/tests/flags/filepath/override
similarity index 100%
rename from tests/flags/warning on non-test filename/override
rename to tests/flags/filepath/override
diff --git a/tests/flags/warning on non-test filename/stdout b/tests/flags/filepath/stdout
similarity index 100%
rename from tests/flags/warning on non-test filename/stdout
rename to tests/flags/filepath/stdout
diff --git a/tests/flags/filepath/warn on non-test b/tests/flags/filepath/warn on non-test
new file mode 100755
index 0000000..56fdf0e
--- /dev/null
+++ b/tests/flags/filepath/warn on non-test	
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+! ../../../urchin /tmp/aoeuaoeuaoeuaoeu
diff --git a/tests/flags/warning on non-test filename/exit code b/tests/flags/warning on non-test filename/exit code
deleted file mode 100755
index e87b089..0000000
--- a/tests/flags/warning on non-test filename/exit code	
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-! ../../../urchin .chainsaw
diff --git a/tests/mac/handle broken readlink b/tests/mac/handle broken readlink
index 9054d75..d350c76 100755
--- a/tests/mac/handle broken readlink	
+++ b/tests/mac/handle broken readlink	
@@ -1,4 +1,3 @@
 #!/bin/sh
 
-export PATH="$PWD/.bin:$PATH"
 urchin .test
diff --git a/tests/mac/setup_dir b/tests/mac/setup_dir
new file mode 100755
index 0000000..1667a9b
--- /dev/null
+++ b/tests/mac/setup_dir
@@ -0,0 +1,2 @@
+export OLD_PATH="$PATH"
+export PATH="$PWD/.bin:$PATH"
diff --git a/tests/mac/teardown_dir b/tests/mac/teardown_dir
new file mode 100755
index 0000000..0eaeb58
--- /dev/null
+++ b/tests/mac/teardown_dir
@@ -0,0 +1,2 @@
+export PATH="$OLD_PATH"
+unset OLD_PATH