diff --git a/tests/test_plugin_file.vim b/tests/test_plugin_file.vim
index 02d916fd..76e08bd8 100755
--- a/tests/test_plugin_file.vim
+++ b/tests/test_plugin_file.vim
@@ -1,5 +1,7 @@
 #!/usr/bin/vim -S
 set nocompatible
+tabedit abc
+tabedit def
 try
 	source powerline/bindings/vim/plugin/powerline.vim
 catch
@@ -16,4 +18,4 @@ if len(mess)>1
 	call writefile(mess, 'message.fail')
 	cquit
 endif
-quit!
+qall!
diff --git a/tests/test_tabline.vim b/tests/test_tabline.vim
new file mode 100755
index 00000000..e96624c5
--- /dev/null
+++ b/tests/test_tabline.vim
@@ -0,0 +1,18 @@
+#!/usr/bin/vim -S
+source powerline/bindings/vim/plugin/powerline.vim
+edit abc
+tabedit def
+tabedit ghi
+try
+	let &columns = 80
+	let result = eval(&tabline[2:])
+catch
+	call writefile(['Exception while evaluating &tabline', v:exception], 'message.fail')
+	cquit
+endtry
+
+if result isnot# '%#Pl_240_5789784_235_2500134_NONE# ./%#Pl_244_8421504_235_2500134_bold#abc %#Pl_244_8421504_235_2500134_NONE# %#Pl_240_5789784_235_2500134_NONE#./%#Pl_244_8421504_235_2500134_bold#def %#Pl_235_2500134_240_5789784_NONE# %#Pl_250_12369084_240_5789784_NONE#./%#Pl_231_16777215_240_5789784_bold#ghi %#Pl_240_5789784_236_3158064_NONE# %#Pl_231_16777215_236_3158064_NONE#                                                       '
+	call writefile(['Unexpected result', result], 'message.fail')
+	cquit
+endif
+qall!