diff --git a/src/testdir/test100.in b/src/testdir/test100.in
index e423319..61d28c1 100644
--- a/src/testdir/test100.in
+++ b/src/testdir/test100.in
@@ -1,4 +1,4 @@
-Tests for 'undolevel' setting being global-local
+Tests for 'undolevel' and 'lispwords' settings being global-local
 
 STARTTEST
 :so small.vim
@@ -37,6 +37,14 @@
 :call UndoLevel()
 :%w >> test.out
 :"sleep 10
+:"
+:" Testing 'lispwords'
+:"
+:setglobal lispwords=foo,bar,baz
+:setlocal lispwords-=foo | setlocal lispwords+=quux
+:redir >> test.out | echon "\nTesting 'lispwords' local value" | setglobal lispwords? | setlocal lispwords? | echo &lispwords . "\n" | redir end
+:setlocal lispwords<
+:redir >> test.out | echon "\nTesting 'lispwords' value reset" | setglobal lispwords? | setlocal lispwords? | echo &lispwords . "\n" | redir end
 :qa!
 ENDTEST
 
diff --git a/src/testdir/test100.ok b/src/testdir/test100.ok
index 95b3184..477106b 100644
--- a/src/testdir/test100.ok
+++ b/src/testdir/test100.ok
@@ -39,3 +39,13 @@
 
   undolevels=50 global
   undolevels=-123456 local
+
+Testing 'lispwords' local value
+  lispwords=foo,bar,baz
+  lispwords=bar,baz,quux
+bar,baz,quux
+
+Testing 'lispwords' value reset
+  lispwords=foo,bar,baz
+  lispwords=foo,bar,baz
+foo,bar,baz