diff --git a/autoload/airline/init.vim b/autoload/airline/init.vim
index 65995ddf..972a4fa4 100644
--- a/autoload/airline/init.vim
+++ b/autoload/airline/init.vim
@@ -67,8 +67,6 @@ function! airline#init#bootstrap()
   call airline#parts#define_raw('file', '%f%m')
   call airline#parts#define_raw('ffenc', '%{printf("%s%s",&fenc,strlen(&ff)>0?"[".&ff."]":"")}')
   call airline#parts#define_empty(['hunks', 'branch', 'tagbar', 'syntastic'])
-
-  call airline#extensions#load()
 endfunction
 
 function! airline#init#sections()
diff --git a/plugin/airline.vim b/plugin/airline.vim
index 65685cea..d0eec0f2 100644
--- a/plugin/airline.vim
+++ b/plugin/airline.vim
@@ -15,6 +15,7 @@ function! s:init()
     let s:airline_initialized = 1
 
     call airline#init#bootstrap()
+    call airline#extensions#load()
     call airline#init#sections()
 
     let s:airline_theme_defined = exists('g:airline_theme')
diff --git a/t/commands.vim b/t/commands.vim
index e4933d9f..98a9bfdd 100644
--- a/t/commands.vim
+++ b/t/commands.vim
@@ -12,6 +12,7 @@ describe 'commands'
   end
 
   it 'should toggle whitespace off and on'
+    call airline#extensions#load()
     execute 'AirlineToggleWhitespace'
     Expect exists('#airline_whitespace') to_be_false
     execute 'AirlineToggleWhitespace'
diff --git a/t/section.vim b/t/section.vim
index 360ec5f6..44c62889 100644
--- a/t/section.vim
+++ b/t/section.vim
@@ -1,4 +1,5 @@
 call airline#init#bootstrap()
+call airline#extensions#load()
 
 function! SectionSpec()
 endfunction