diff --git a/plugin/magit.vim b/plugin/magit.vim
index 68d417c3010abeb3a0946f49b78ab545e3065be3..4e69ba8cec1891931a7610f087774afd53eaf766 100644
--- a/plugin/magit.vim
+++ b/plugin/magit.vim
@@ -518,7 +518,10 @@ endfunction
 " param[in] visible : boolean, force visible value. If not set, toggle
 " visibility
 function! magit#open_close_folding(...)
+	call vader#log(g:magit_file_re)
+	call vader#log(getline("."))
 	let list = matchlist(getline("."), g:magit_file_re)
+	call vader#log(list)
 	if ( empty(list) )
 		throw 'non file header line: ' . getline(".")
 	endif
@@ -1345,7 +1348,7 @@ function! magit#jump_to()
 			execute "edit " . "+" . line_in_file . " " filename
 		endif
 	catch
-		if ( v:exception == 'Vim:Interrupt' && buf_win == 0)
+		if ( v:exception == 'Vim:Interrupt' && bufwinid(filename) != -1)
 			close
 		elseif ( v:exception != 'Vim(edit):E325: ATTENTION' )
 			throw "vimagit: " . v:exception
diff --git a/test/run.sh b/test/run.sh
index 8b585bc9b0ff65f1ff5ffbc0e41f5f962d459a34..cd7ec9fc8218a8104b65e5932ffac6a37fe68f4f 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -1,6 +1,6 @@
-set -e
+set -evx
 
-if [[ "$VIMGAGIT_TEST_VERBOSE" == "1" ]]; then
+if [[ "$VIMAGIT_TEST_VERBOSE" == "1" ]]; then
 	set -x
 fi
 
@@ -71,17 +71,7 @@ for script in ${!test_scripts[@]}; do
 
 				echo "Test $script with $filename from path $TEST_SUB_PATH and from $([ $i -eq 1 ] && echo "end" || echo "start") of line"
 
-				$VIM -Nu <(cat << EOF
-				filetype off
-				set rtp-=~/.vim
-				set rtp-=~/.vim/after
-				set rtp+=$VIMAGIT_PATH
-				set rtp+=$VADER_PATH
-				let g:vader_show_version=0
-				filetype plugin indent on
-				syntax enable
-EOF
-) -c "Vader! $VIMAGIT_PATH/test/$script 2> >(sed -n '/^Starting Vader/,$p')"
+				$VIM -Nu test/vimrc -c "Vader! $VIMAGIT_PATH/test/$script 2> >(sed -n '/^Starting Vader/,$p')"
 
 			done
 		done
diff --git a/test/vimrc b/test/vimrc
new file mode 100644
index 0000000000000000000000000000000000000000..2234d3b4731830d0e6fe26d0afaed3f9f209e811
--- /dev/null
+++ b/test/vimrc
@@ -0,0 +1,9 @@
+filetype off
+set rtp-=~/.vim
+set rtp-=~/.vim/after
+set rtp+=$VIMAGIT_PATH
+set rtp+=$VADER_PATH
+let g:vader_show_version=0
+filetype plugin indent on
+syntax enable
+