diff --git a/autoload/jedi.vim b/autoload/jedi.vim
index d0ebc5d..22ce3c7 100644
--- a/autoload/jedi.vim
+++ b/autoload/jedi.vim
@@ -367,11 +367,14 @@ endfunc
 
 
 function! jedi#configure_call_signatures()
+    augroup jedi_call_signatures
+    au!
     if g:jedi#show_call_signatures == 2  " Command line call signatures
         autocmd InsertEnter <buffer> let g:jedi#first_col = s:save_first_col()
     endif
     autocmd InsertLeave <buffer> PythonJedi jedi_vim.clear_call_signatures()
     autocmd CursorMovedI <buffer> PythonJedi jedi_vim.show_call_signatures()
+    augroup END
 endfunction
 
 
diff --git a/test/signatures.vim b/test/signatures.vim
index f16bbb2..b2c57e7 100644
--- a/test/signatures.vim
+++ b/test/signatures.vim
@@ -50,7 +50,7 @@ describe 'signatures'
         redir => msg
         doautocmd InsertLeave 
         redir END
-        Expect msg == "\n\n"
+        Expect msg == "\n"
     end
 
     it 'command line no signature'