diff --git a/test/indent/sh/deindent-after-done/cmd b/test/indent/sh/deindent-after-done/cmd
new file mode 100644
index 000000000..2bc67f432
--- /dev/null
+++ b/test/indent/sh/deindent-after-done/cmd
@@ -0,0 +1 @@
+gei<ret>
diff --git a/test/indent/sh/deindent-after-done/in b/test/indent/sh/deindent-after-done/in
new file mode 100644
index 000000000..aba228048
--- /dev/null
+++ b/test/indent/sh/deindent-after-done/in
@@ -0,0 +1,3 @@
+while true; do
+    thing1
+    done
diff --git a/test/indent/sh/deindent-after-done/out b/test/indent/sh/deindent-after-done/out
new file mode 100644
index 000000000..029beac98
--- /dev/null
+++ b/test/indent/sh/deindent-after-done/out
@@ -0,0 +1,4 @@
+while true; do
+    thing1
+done
+
diff --git a/test/indent/sh/deindent-after-done/rc b/test/indent/sh/deindent-after-done/rc
new file mode 100644
index 000000000..4795bd804
--- /dev/null
+++ b/test/indent/sh/deindent-after-done/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/sh.kak"
+set buffer filetype sh
diff --git a/test/indent/sh/deindent-after-esac/in b/test/indent/sh/deindent-after-esac/in
new file mode 100644
index 000000000..0264f1733
--- /dev/null
+++ b/test/indent/sh/deindent-after-esac/in
@@ -0,0 +1,5 @@
+case $foo in
+    bar)
+        thing1
+        thing2
+    ;;
diff --git a/test/indent/sh/deindent-after-esac/out b/test/indent/sh/deindent-after-esac/out
new file mode 100644
index 000000000..391200395
--- /dev/null
+++ b/test/indent/sh/deindent-after-esac/out
@@ -0,0 +1,6 @@
+case $foo in
+    bar)
+        thing1
+        thing2
+    ;;
+esac
diff --git a/test/indent/sh/deindent-after-esac/rc b/test/indent/sh/deindent-after-esac/rc
new file mode 100644
index 000000000..4795bd804
--- /dev/null
+++ b/test/indent/sh/deindent-after-esac/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/sh.kak"
+set buffer filetype sh
diff --git a/test/indent/sh/deindent-after-fi/cmd b/test/indent/sh/deindent-after-fi/cmd
new file mode 100644
index 000000000..edb2652bb
--- /dev/null
+++ b/test/indent/sh/deindent-after-fi/cmd
@@ -0,0 +1 @@
+gei<ret>fi<ret>
diff --git a/test/indent/sh/deindent-after-fi/in b/test/indent/sh/deindent-after-fi/in
new file mode 100644
index 000000000..060389abf
--- /dev/null
+++ b/test/indent/sh/deindent-after-fi/in
@@ -0,0 +1,2 @@
+if [ $foo ]; then
+    thing1
diff --git a/test/indent/sh/deindent-after-fi/out b/test/indent/sh/deindent-after-fi/out
new file mode 100644
index 000000000..6df449ca1
--- /dev/null
+++ b/test/indent/sh/deindent-after-fi/out
@@ -0,0 +1,4 @@
+if [ $foo ]; then
+    thing1
+fi
+
diff --git a/test/indent/sh/deindent-after-fi/rc b/test/indent/sh/deindent-after-fi/rc
new file mode 100644
index 000000000..4795bd804
--- /dev/null
+++ b/test/indent/sh/deindent-after-fi/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/sh.kak"
+set buffer filetype sh
diff --git a/test/indent/sh/deindent-case-option/cmd b/test/indent/sh/deindent-case-option/cmd
new file mode 100644
index 000000000..1a5f223e3
--- /dev/null
+++ b/test/indent/sh/deindent-case-option/cmd
@@ -0,0 +1 @@
+gei<ret>;;<ret>*)
diff --git a/test/indent/sh/deindent-case-option/in b/test/indent/sh/deindent-case-option/in
new file mode 100644
index 000000000..06c64dac9
--- /dev/null
+++ b/test/indent/sh/deindent-case-option/in
@@ -0,0 +1,5 @@
+case $foo in
+    bar) thing1;;
+    baz)
+        thing1
+        thing2
diff --git a/test/indent/sh/deindent-case-option/out b/test/indent/sh/deindent-case-option/out
new file mode 100644
index 000000000..7d9a6fa69
--- /dev/null
+++ b/test/indent/sh/deindent-case-option/out
@@ -0,0 +1,7 @@
+case $foo in
+    bar) thing1;;
+    baz)
+        thing1
+        thing2
+        ;;
+    *)
diff --git a/test/indent/sh/deindent-case-option/rc b/test/indent/sh/deindent-case-option/rc
new file mode 100644
index 000000000..4795bd804
--- /dev/null
+++ b/test/indent/sh/deindent-case-option/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/sh.kak"
+set buffer filetype sh
diff --git a/test/indent/sh/deindent-compound-command/cmd b/test/indent/sh/deindent-compound-command/cmd
new file mode 100644
index 000000000..2bc67f432
--- /dev/null
+++ b/test/indent/sh/deindent-compound-command/cmd
@@ -0,0 +1 @@
+gei<ret>
diff --git a/test/indent/sh/deindent-compound-command/in b/test/indent/sh/deindent-compound-command/in
new file mode 100644
index 000000000..a82d0f494
--- /dev/null
+++ b/test/indent/sh/deindent-compound-command/in
@@ -0,0 +1,3 @@
+foo () {
+    thing1
+    }
diff --git a/test/indent/sh/deindent-compound-command/out b/test/indent/sh/deindent-compound-command/out
new file mode 100644
index 000000000..70841a6b3
--- /dev/null
+++ b/test/indent/sh/deindent-compound-command/out
@@ -0,0 +1,4 @@
+foo () {
+    thing1
+}
+
diff --git a/test/indent/sh/deindent-compound-command/rc b/test/indent/sh/deindent-compound-command/rc
new file mode 100644
index 000000000..4795bd804
--- /dev/null
+++ b/test/indent/sh/deindent-compound-command/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/sh.kak"
+set buffer filetype sh
diff --git a/test/indent/sh/deindent-one-line-case-option/cmd b/test/indent/sh/deindent-one-line-case-option/cmd
new file mode 100644
index 000000000..22e452950
--- /dev/null
+++ b/test/indent/sh/deindent-one-line-case-option/cmd
@@ -0,0 +1 @@
+gei<ret>baz)
diff --git a/test/indent/sh/deindent-one-line-case-option/in b/test/indent/sh/deindent-one-line-case-option/in
new file mode 100644
index 000000000..08e8d55b5
--- /dev/null
+++ b/test/indent/sh/deindent-one-line-case-option/in
@@ -0,0 +1,2 @@
+case $foo in
+    bar) thing1;;
diff --git a/test/indent/sh/deindent-one-line-case-option/out b/test/indent/sh/deindent-one-line-case-option/out
new file mode 100644
index 000000000..b0d854a5c
--- /dev/null
+++ b/test/indent/sh/deindent-one-line-case-option/out
@@ -0,0 +1,3 @@
+case $foo in
+    bar) thing1;;
+    baz)
diff --git a/test/indent/sh/deindent-one-line-case-option/rc b/test/indent/sh/deindent-one-line-case-option/rc
new file mode 100644
index 000000000..4795bd804
--- /dev/null
+++ b/test/indent/sh/deindent-one-line-case-option/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/sh.kak"
+set buffer filetype sh
diff --git a/test/indent/sh/deindent-only-else/cmd b/test/indent/sh/deindent-only-else/cmd
new file mode 100644
index 000000000..d6c743f9c
--- /dev/null
+++ b/test/indent/sh/deindent-only-else/cmd
@@ -0,0 +1 @@
+gei<ret>baz
diff --git a/test/indent/sh/deindent-only-else/in b/test/indent/sh/deindent-only-else/in
new file mode 100644
index 000000000..8b287fd40
--- /dev/null
+++ b/test/indent/sh/deindent-only-else/in
@@ -0,0 +1,3 @@
+if [ $foo ]; then
+    bar
+    else
diff --git a/test/indent/sh/deindent-only-else/out b/test/indent/sh/deindent-only-else/out
new file mode 100644
index 000000000..75d8b0fa8
--- /dev/null
+++ b/test/indent/sh/deindent-only-else/out
@@ -0,0 +1,4 @@
+if [ $foo ]; then
+    bar
+else
+    baz
diff --git a/test/indent/sh/deindent-only-else/rc b/test/indent/sh/deindent-only-else/rc
new file mode 100644
index 000000000..4795bd804
--- /dev/null
+++ b/test/indent/sh/deindent-only-else/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/sh.kak"
+set buffer filetype sh
diff --git a/test/indent/sh/indent-after-do/cmd b/test/indent/sh/indent-after-do/cmd
new file mode 100644
index 000000000..0bc4727fd
--- /dev/null
+++ b/test/indent/sh/indent-after-do/cmd
@@ -0,0 +1 @@
+gei<ret>thing1
diff --git a/test/indent/sh/indent-after-do/in b/test/indent/sh/indent-after-do/in
new file mode 100644
index 000000000..48ec3642b
--- /dev/null
+++ b/test/indent/sh/indent-after-do/in
@@ -0,0 +1 @@
+while true; do
diff --git a/test/indent/sh/indent-after-do/out b/test/indent/sh/indent-after-do/out
new file mode 100644
index 000000000..210ac4092
--- /dev/null
+++ b/test/indent/sh/indent-after-do/out
@@ -0,0 +1,2 @@
+while true; do
+    thing1
diff --git a/test/indent/sh/indent-after-do/rc b/test/indent/sh/indent-after-do/rc
new file mode 100644
index 000000000..4795bd804
--- /dev/null
+++ b/test/indent/sh/indent-after-do/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/sh.kak"
+set buffer filetype sh
diff --git a/test/indent/sh/indent-after-in/cmd b/test/indent/sh/indent-after-in/cmd
new file mode 100644
index 000000000..e3f54ff43
--- /dev/null
+++ b/test/indent/sh/indent-after-in/cmd
@@ -0,0 +1 @@
+gei<ret>bar)
diff --git a/test/indent/sh/indent-after-in/in b/test/indent/sh/indent-after-in/in
new file mode 100644
index 000000000..a94d1a3c5
--- /dev/null
+++ b/test/indent/sh/indent-after-in/in
@@ -0,0 +1 @@
+case $foo in
diff --git a/test/indent/sh/indent-after-in/out b/test/indent/sh/indent-after-in/out
new file mode 100644
index 000000000..a3be70a09
--- /dev/null
+++ b/test/indent/sh/indent-after-in/out
@@ -0,0 +1,2 @@
+case $foo in
+    bar)
diff --git a/test/indent/sh/indent-after-in/rc b/test/indent/sh/indent-after-in/rc
new file mode 100644
index 000000000..4795bd804
--- /dev/null
+++ b/test/indent/sh/indent-after-in/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/sh.kak"
+set buffer filetype sh
diff --git a/test/indent/sh/indent-after-then/cmd b/test/indent/sh/indent-after-then/cmd
new file mode 100644
index 000000000..0bc4727fd
--- /dev/null
+++ b/test/indent/sh/indent-after-then/cmd
@@ -0,0 +1 @@
+gei<ret>thing1
diff --git a/test/indent/sh/indent-after-then/in b/test/indent/sh/indent-after-then/in
new file mode 100644
index 000000000..c640fe4ff
--- /dev/null
+++ b/test/indent/sh/indent-after-then/in
@@ -0,0 +1 @@
+if [ $foo ]; then
diff --git a/test/indent/sh/indent-after-then/out b/test/indent/sh/indent-after-then/out
new file mode 100644
index 000000000..060389abf
--- /dev/null
+++ b/test/indent/sh/indent-after-then/out
@@ -0,0 +1,2 @@
+if [ $foo ]; then
+    thing1
diff --git a/test/indent/sh/indent-after-then/rc b/test/indent/sh/indent-after-then/rc
new file mode 100644
index 000000000..4795bd804
--- /dev/null
+++ b/test/indent/sh/indent-after-then/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/sh.kak"
+set buffer filetype sh
diff --git a/test/indent/sh/indent-block-case/cmd b/test/indent/sh/indent-block-case/cmd
new file mode 100644
index 000000000..3598c36a8
--- /dev/null
+++ b/test/indent/sh/indent-block-case/cmd
@@ -0,0 +1 @@
+gei<ret>thing1<ret>thing2
diff --git a/test/indent/sh/indent-block-case/in b/test/indent/sh/indent-block-case/in
new file mode 100644
index 000000000..b0d854a5c
--- /dev/null
+++ b/test/indent/sh/indent-block-case/in
@@ -0,0 +1,3 @@
+case $foo in
+    bar) thing1;;
+    baz)
diff --git a/test/indent/sh/indent-block-case/out b/test/indent/sh/indent-block-case/out
new file mode 100644
index 000000000..06c64dac9
--- /dev/null
+++ b/test/indent/sh/indent-block-case/out
@@ -0,0 +1,5 @@
+case $foo in
+    bar) thing1;;
+    baz)
+        thing1
+        thing2
diff --git a/test/indent/sh/indent-block-case/rc b/test/indent/sh/indent-block-case/rc
new file mode 100644
index 000000000..4795bd804
--- /dev/null
+++ b/test/indent/sh/indent-block-case/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/sh.kak"
+set buffer filetype sh
diff --git a/test/indent/sh/indent-compound-command/cmd b/test/indent/sh/indent-compound-command/cmd
new file mode 100644
index 000000000..0bc4727fd
--- /dev/null
+++ b/test/indent/sh/indent-compound-command/cmd
@@ -0,0 +1 @@
+gei<ret>thing1
diff --git a/test/indent/sh/indent-compound-command/in b/test/indent/sh/indent-compound-command/in
new file mode 100644
index 000000000..957b235ed
--- /dev/null
+++ b/test/indent/sh/indent-compound-command/in
@@ -0,0 +1 @@
+foo () {
diff --git a/test/indent/sh/indent-compound-command/out b/test/indent/sh/indent-compound-command/out
new file mode 100644
index 000000000..43b16506a
--- /dev/null
+++ b/test/indent/sh/indent-compound-command/out
@@ -0,0 +1,2 @@
+foo () {
+    thing1
diff --git a/test/indent/sh/indent-compound-command/rc b/test/indent/sh/indent-compound-command/rc
new file mode 100644
index 000000000..4795bd804
--- /dev/null
+++ b/test/indent/sh/indent-compound-command/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/sh.kak"
+set buffer filetype sh