diff --git a/Makefile b/Makefile
index 8027c87..c7cf7cf 100644
--- a/Makefile
+++ b/Makefile
@@ -9,11 +9,7 @@ endif
 RPM=shunit-$(VERSION)-$(RELEASE).noarch.rpm
 
 ifndef PREFIX
-	PREFIX=/
-endif
-
-ifeq ($(shell uname -o),Cygwin)
-        PREFIX=
+	PREFIX=''
 endif
 
 DISTFILE_DEPS=$(shell find . -type f | grep -Ev '\.git|\./dist/|$(DISTFILE)')
diff --git a/bin/shunit.sh b/bin/shunit.sh
index 3ddb4ec..ab8b98a 100644
--- a/bin/shunit.sh
+++ b/bin/shunit.sh
@@ -42,6 +42,7 @@ do
 		${FORMATTER}_testcase "$file" "$key" "$delta" "Exit ${ERRFLAG}" "$SHORTERR" "${ERR}"
 	    fi
 	fi
+	unset -f $key
     done
     unset tests
 done