diff --git a/test/goto.vim b/test/goto.vim
index 48f038c..6163093 100644
--- a/test/goto.vim
+++ b/test/goto.vim
@@ -67,6 +67,7 @@ describe 'goto_with_tabs'
         Expect line('.') == 1
         Expect col('.') == 1
         Expect tabpagenr('$') == 2
+        Expect winnr('$') == 1
         tabprevious
         Expect bufname('%') == ''
     end
@@ -78,12 +79,14 @@ describe 'goto_with_tabs'
         Expect g:current_buffer_is_module('token') == 0
         execute "normal \<CR>"
         Expect tabpagenr('$') == 2
+        Expect winnr('$') == 1
         Expect g:current_buffer_is_module('token') == 1
 
         bd
         silent normal G$\d
         execute "normal j\<CR>"
         Expect tabpagenr('$') == 2
+        Expect winnr('$') == 1
         Expect g:current_buffer_is_module('tokenize') == 1
     end
 end
@@ -112,6 +115,7 @@ describe 'goto_with_buffers'
         set hidden
         call jedi#goto_assignments()
         Expect g:current_buffer_is_module('os') == 1
+        Expect winnr('$') == 1
         Expect tabpagenr('$') == 1
         Expect line('.') == 1
         Expect col('.') == 1
@@ -125,12 +129,14 @@ describe 'goto_with_buffers'
         Expect g:current_buffer_is_module('token') == 0
         execute "normal \<CR>"
         Expect tabpagenr('$') == 1
+        Expect winnr('$') == 1
         Expect g:current_buffer_is_module('token') == 1
 
         bd
         silent normal G$\d
         execute "normal j\<CR>"
         Expect tabpagenr('$') == 1
+        Expect winnr('$') == 1
         Expect g:current_buffer_is_module('tokenize') == 1
     end
 end