diff --git a/.gitignore b/.gitignore
index 17402e5..553bae5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .DS_Store
 doc/tags
+test/.deps
diff --git a/test/airline-themes.vim b/test/airline-themes.vim
new file mode 100644
index 0000000..f7856c6
--- /dev/null
+++ b/test/airline-themes.vim
@@ -0,0 +1,35 @@
+scriptencoding utf-8
+
+let s:themes_dir = expand('<sfile>:h:h') . '/autoload/airline/themes'
+let s:themes = map(glob(s:themes_dir . '/*.vim', 1, 1), 'fnamemodify(v:val, ":t:r")')
+let s:suite = themis#suite('vim-airline-themes')
+
+function! s:Test_AirlineTheme(theme)
+  Throws execute('AirlineTheme ' . a:theme)
+endfunction
+
+function! s:command_insert(theme)
+  execute('AirlineTheme ' . a:theme)
+  execute('source ' . expand('<sfile>:h:h') . '/autoload/airline/themes/' . a:theme . '.vim')
+  Throws normal! i
+endfunction
+
+function! s:command_command(theme)
+  execute('AirlineTheme ' . a:theme)
+  execute('source ' . expand('<sfile>:h:h') . '/autoload/airline/themes/' . a:theme . '.vim')
+  Throws normal! :
+endfunction
+
+function! s:suite.__insert__()
+  let child = themis#suite('INSERT')
+  for theme in s:themes
+    let child[theme] = funcref('s:command_insert', [theme])
+  endfor
+endfunction
+
+function! s:suite.__command__()
+  let child = themis#suite('COMMAND')
+  for theme in s:themes
+    let child[theme] = funcref('s:command_command', [theme])
+  endfor
+endfunction
diff --git a/test/test.vim b/test/test.vim
deleted file mode 100644
index 947d61b..0000000
--- a/test/test.vim
+++ /dev/null
@@ -1,16 +0,0 @@
-scriptencoding utf-8
-
-let s:themes_dir = expand('<sfile>:h:h') . '/autoload/airline/themes'
-let s:themes = map(glob(s:themes_dir . '/*.vim', 1, 1), 'fnamemodify(v:val, ":t:r")')
-let s:suite = themis#suite('vim-airline-themes')
-
-function! s:Test(theme)
-  Throws execute('AirlineTheme ' . a:theme)
-endfunction
-
-function! s:suite.__themes__()
-  let child = themis#suite('ExistThemes')
-  for theme in s:themes
-    let child[theme] = funcref('s:Test', [theme])
-  endfor
-endfunction