diff --git a/test/indent/c-family/deindent-function-closing-brace/cmd b/test/indent/c-family/deindent-function-closing-brace/cmd
new file mode 100644
index 000000000..e3036a407
--- /dev/null
+++ b/test/indent/c-family/deindent-function-closing-brace/cmd
@@ -0,0 +1 @@
+c<ret>
diff --git a/test/indent/c-family/deindent-function-closing-brace/in b/test/indent/c-family/deindent-function-closing-brace/in
new file mode 100644
index 000000000..34193ba94
--- /dev/null
+++ b/test/indent/c-family/deindent-function-closing-brace/in
@@ -0,0 +1,12 @@
+void foo(void) {%( )}
+
+void foo(void) {%( )
+}
+
+void foo(void) {%( )bar()}
+
+void foo(void) {%( )bar()
+}
+
+void foo(void) {
+    bar()%( )}
diff --git a/test/indent/c-family/deindent-function-closing-brace/out b/test/indent/c-family/deindent-function-closing-brace/out
new file mode 100644
index 000000000..827927d0e
--- /dev/null
+++ b/test/indent/c-family/deindent-function-closing-brace/out
@@ -0,0 +1,17 @@
+void foo(void) {
+}
+
+void foo(void) {
+    
+}
+
+void foo(void) {
+    bar()}
+
+void foo(void) {
+    bar()
+}
+
+void foo(void) {
+    bar()
+}
diff --git a/test/indent/c-family/deindent-function-closing-brace/rc b/test/indent/c-family/deindent-function-closing-brace/rc
new file mode 100644
index 000000000..2c2a7247d
--- /dev/null
+++ b/test/indent/c-family/deindent-function-closing-brace/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
+set buffer filetype cpp
diff --git a/test/indent/c-family/deindent-generic-closing-brace/cmd b/test/indent/c-family/deindent-generic-closing-brace/cmd
new file mode 100644
index 000000000..e3036a407
--- /dev/null
+++ b/test/indent/c-family/deindent-generic-closing-brace/cmd
@@ -0,0 +1 @@
+c<ret>
diff --git a/test/indent/c-family/deindent-generic-closing-brace/in b/test/indent/c-family/deindent-generic-closing-brace/in
new file mode 100644
index 000000000..b2f7c26d6
--- /dev/null
+++ b/test/indent/c-family/deindent-generic-closing-brace/in
@@ -0,0 +1,25 @@
+{%( )}
+
+{%( )
+}
+
+{%( )bar()}
+
+{%( )bar()
+}
+
+{
+    bar()%( )}
+
+{(%( ))}
+
+{(%( )
+)}
+
+{(%( )foo())}
+
+{(%( )foo()
+)}
+
+{(
+    bar()%( ))}
diff --git a/test/indent/c-family/deindent-generic-closing-brace/out b/test/indent/c-family/deindent-generic-closing-brace/out
new file mode 100644
index 000000000..581098178
--- /dev/null
+++ b/test/indent/c-family/deindent-generic-closing-brace/out
@@ -0,0 +1,35 @@
+{
+}
+
+{
+    
+}
+
+{
+    bar()}
+
+{
+    bar()
+}
+
+{
+    bar()
+}
+
+{(
+)}
+
+{(
+    
+)}
+
+{(
+    foo())}
+
+{(
+    foo()
+)}
+
+{(
+    bar()
+)}
diff --git a/test/indent/c-family/deindent-generic-closing-brace/rc b/test/indent/c-family/deindent-generic-closing-brace/rc
new file mode 100644
index 000000000..2c2a7247d
--- /dev/null
+++ b/test/indent/c-family/deindent-generic-closing-brace/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
+set buffer filetype cpp
diff --git a/test/indent/c-family/deindent-if-closing-brace/cmd b/test/indent/c-family/deindent-if-closing-brace/cmd
new file mode 100644
index 000000000..e3036a407
--- /dev/null
+++ b/test/indent/c-family/deindent-if-closing-brace/cmd
@@ -0,0 +1 @@
+c<ret>
diff --git a/test/indent/c-family/deindent-if-closing-brace/in b/test/indent/c-family/deindent-if-closing-brace/in
new file mode 100644
index 000000000..8d46bc970
--- /dev/null
+++ b/test/indent/c-family/deindent-if-closing-brace/in
@@ -0,0 +1,12 @@
+if (1) {%( )}
+
+if (1) {%( )
+}
+
+if (1) {%( )bar()}
+
+if (1) {%( )bar()
+}
+
+if (1) {
+    bar()%( )}
diff --git a/test/indent/c-family/deindent-if-closing-brace/out b/test/indent/c-family/deindent-if-closing-brace/out
new file mode 100644
index 000000000..df0b059e1
--- /dev/null
+++ b/test/indent/c-family/deindent-if-closing-brace/out
@@ -0,0 +1,17 @@
+if (1) {
+}
+
+if (1) {
+    
+}
+
+if (1) {
+    bar()}
+
+if (1) {
+    bar()
+}
+
+if (1) {
+    bar()
+}
diff --git a/test/indent/c-family/deindent-if-closing-brace/rc b/test/indent/c-family/deindent-if-closing-brace/rc
new file mode 100644
index 000000000..2c2a7247d
--- /dev/null
+++ b/test/indent/c-family/deindent-if-closing-brace/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
+set buffer filetype cpp