diff --git a/tests/- directories starting with a hypen.../Should work b/tests/- directories starting with a hypen.../Should work
new file mode 100755
index 0000000..039e4d0
--- /dev/null
+++ b/tests/- directories starting with a hypen.../Should work	
@@ -0,0 +1,2 @@
+#!/bin/sh
+exit 0
diff --git a/urchin b/urchin
index 1db42c3..8ac2251 100755
--- a/urchin
+++ b/urchin
@@ -2,7 +2,7 @@
 
 fullpath() {
   (
-    cd "$1"
+    cd -- "$1"
     pwd
   )
 }
@@ -28,7 +28,7 @@ recurse() {
     (
       indent $indent_level
       echo "  ${potential_test}"
-      cd "$potential_test"
+      cd -- "$potential_test"
       [ -f setup_dir ] && [ -x setup_dir ] && ./setup_dir >> "$stdout_file"
       for test in *
         do