diff --git a/README.rst b/README.rst
index 5cceeed..289af34 100644
--- a/README.rst
+++ b/README.rst
@@ -120,12 +120,11 @@ are automatically initialized, but you can skip this:
     let g:jedi#auto_vim_configuration = 0
 
 
-If you are a person who likes to use VIM-buffers not tabs, you might want to
-put that in your ``.vimrc``:
+You can make jedi-vim use tabs when going to a definition etc:
 
 .. code-block:: vim
 
-    let g:jedi#use_tabs_not_buffers = 0
+    let g:jedi#use_tabs_not_buffers = 1
 
 If you are a person who likes to use VIM-splits, you might want to put this in your ``.vimrc``:
 
diff --git a/autoload/jedi.vim b/autoload/jedi.vim
index ffdc360..314611c 100644
--- a/autoload/jedi.vim
+++ b/autoload/jedi.vim
@@ -12,7 +12,7 @@ let s:deprecations = {
 \ }
 
 let s:default_settings = {
-    \ 'use_tabs_not_buffers': 1,
+    \ 'use_tabs_not_buffers': 0,
     \ 'use_splits_not_buffers': 1,
     \ 'auto_initialization': 1,
     \ 'auto_vim_configuration': 1,
diff --git a/doc/jedi-vim.txt b/doc/jedi-vim.txt
index 84f49e2..21d70f6 100644
--- a/doc/jedi-vim.txt
+++ b/doc/jedi-vim.txt
@@ -423,12 +423,12 @@ manually by calling a function in your configuration file: >
 ------------------------------------------------------------------------------
 6.7. `g:jedi#use_tabs_not_buffers`	*g:jedi#use_tabs_not_buffers*
 
-By default, jedi-vim opens a new tab if you use the "go to", "show
-definition", or "related names" commands. When you set this option to 0, they
-open in the current buffer instead.
+You can make jedi-vim open a new tab if you use the "go to", "show
+definition", or "related names" commands. When you leave this at the default
+(0), they open in the current buffer instead.
 
 Options: 0 or 1
-Default: 1 (Command output is put in a new tab)
+Default: 0 (Command output is put in a new tab)
 
 ------------------------------------------------------------------------------
 6.8. `g:jedi#squelch_py_warning`	*g:jedi#squelch_py_warning*
diff --git a/test/goto.vim b/test/goto.vim
index d86dc3b..75a7c6f 100644
--- a/test/goto.vim
+++ b/test/goto.vim
@@ -48,6 +48,7 @@ end
 describe 'goto_with_tabs'
     before
         set filetype=python
+        let g:jedi#use_tabs_not_buffers = 1
     end
 
     after
@@ -75,7 +76,7 @@ describe 'goto_with_tabs'
     it 'multi_definitions'
         " This used to behave differently. Now we don't have any real multi
         " definitions.
-        
+
         " put = ['import tokenize']
         " silent normal G$\d
         " Expect CurrentBufferIsModule('tokenize') == 1
diff --git a/test/pyimport.vim b/test/pyimport.vim
index eb7ca76..098113c 100644
--- a/test/pyimport.vim
+++ b/test/pyimport.vim
@@ -2,6 +2,10 @@ source plugin/jedi.vim
 source test/utils.vim
 
 describe 'pyimport'
+    before
+        let g:jedi#use_tabs_not_buffers = 1
+    end
+
     after
         bd!
         bd!