diff --git a/autoload/airline/extensions/whitespace.vim b/autoload/airline/extensions/whitespace.vim
index 234c732..3766f4e 100644
--- a/autoload/airline/extensions/whitespace.vim
+++ b/autoload/airline/extensions/whitespace.vim
@@ -56,6 +56,7 @@ endfunction!
 function! airline#extensions#whitespace#toggle()
   if s:enabled
     autocmd! airline_whitespace CursorHold,BufWritePost
+    augroup! airline_whitespace
     let s:enabled = 0
   else
     call airline#extensions#whitespace#init()
diff --git a/t/commands.vim b/t/commands.vim
new file mode 100644
index 0000000..8038ffd
--- /dev/null
+++ b/t/commands.vim
@@ -0,0 +1,26 @@
+call airline#init#bootstrap()
+source plugin/airline.vim
+
+describe 'commands'
+  it 'should toggle off and on'
+    execute 'AirlineToggle'
+    Expect exists('#airline') to_be_false
+    execute 'AirlineToggle'
+    Expect exists('#airline') to_be_true
+  end
+
+  it 'should toggle whitespace off and on'
+    execute 'AirlineToggleWhitespace'
+    Expect exists('#airline_whitespace') to_be_false
+    execute 'AirlineToggleWhitespace'
+    Expect exists('#airline_whitespace') to_be_true
+  end
+
+  it 'should display theme name with no args'
+    execute 'AirlineTheme simple'
+    Expect g:airline_theme == 'simple'
+    execute 'AirlineTheme dark'
+    Expect g:airline_theme == 'dark'
+  end
+end
+