diff --git a/autoload/startify.vim b/autoload/startify.vim
index a660f46..6de3b47 100644
--- a/autoload/startify.vim
+++ b/autoload/startify.vim
@@ -756,7 +756,7 @@ endfunction
 function! s:create_last_session_link(spath)
   if !has('win32') && a:spath !~# '__LAST__$'
     let cmd = printf('ln -sf %s %s',
-          \ shellescape(a:spath),
+          \ shellescape(fnamemodify(a:spath, ':t')),
           \ shellescape(s:session_dir .'/__LAST__'))
     silent! call system(cmd)
     if v:shell_error
diff --git a/test/feature/buffer.vader b/test/feature/buffer.vader
index 91a7b34..b285df7 100644
--- a/test/feature/buffer.vader
+++ b/test/feature/buffer.vader
@@ -1,7 +1,7 @@
 Before:
   Startify
 
-Execute (Check set options):
+Execute (Check buffer options):
   AssertEqual 'startify', &filetype
   AssertEqual 'wipe',     &bufhidden
   AssertEqual 'nofile',   &buftype
diff --git a/test/feature/mappings.vader b/test/feature/mapping.vader
similarity index 100%
rename from test/feature/mappings.vader
rename to test/feature/mapping.vader
diff --git a/test/feature/session.vader b/test/feature/session.vader
new file mode 100644
index 0000000..16f2aa8
--- /dev/null
+++ b/test/feature/session.vader
@@ -0,0 +1,18 @@
+Execute (Session: :SSave foo):
+  edit include/testfile.txt
+  SSave foo
+  SClose
+Do:
+  e
+Expect:
+  
+Execute (Session: :SLoad foo):
+  silent SLoad foo
+Expect:
+  This is just a simple test file.
+  Foo, bar, quux.
+
+Execute (Session: :SDelete foo):
+  Assert 1 == filereadable(g:startify_session_dir.'/foo')
+  SDelete foo
+  Assert 0 == filereadable(g:startify_session_dir.'/foo')
diff --git a/test/include/testfile.txt b/test/include/testfile.txt
new file mode 100644
index 0000000..01ad94a
--- /dev/null
+++ b/test/include/testfile.txt
@@ -0,0 +1,2 @@
+This is just a simple test file.
+Foo, bar, quux.
diff --git a/test/vader.vader b/test/vader.vader
index 61a536a..a1fbe14 100644
--- a/test/vader.vader
+++ b/test/vader.vader
@@ -2,4 +2,5 @@ Execute (:Startify command available):
   Assert 2 == exists(':Startify')
 
 Include: feature/buffer.vader
-Include: feature/mappings.vader
+Include: feature/mapping.vader
+Include: feature/session.vader
diff --git a/test/vimrc b/test/vimrc
index 081821f..e7aaf48 100644
--- a/test/vimrc
+++ b/test/vimrc
@@ -4,3 +4,6 @@ set runtimepath+=..
 filetype plugin on
 syntax enable
 set hidden
+set sessionoptions-=tabpages
+let g:startify_session_dir = 'include'
+let g:startify_relative_path = 1