diff --git a/test/indent/go/deindent-function-closing-brace/cmd b/test/indent/go/deindent-function-closing-brace/cmd
new file mode 100644
index 00000000..e3036a40
--- /dev/null
+++ b/test/indent/go/deindent-function-closing-brace/cmd
@@ -0,0 +1 @@
+c<ret>
diff --git a/test/indent/go/deindent-function-closing-brace/in b/test/indent/go/deindent-function-closing-brace/in
new file mode 100644
index 00000000..6c56be4e
--- /dev/null
+++ b/test/indent/go/deindent-function-closing-brace/in
@@ -0,0 +1,12 @@
+func foo(x int) int {%( )}
+
+func foo(x int) int {%( )
+}
+
+func foo(x int) int {%( )bar()}
+
+func foo(x int) int {%( )bar()
+}
+
+func foo(x int) int {
+    bar()%( )}
diff --git a/test/indent/go/deindent-function-closing-brace/out b/test/indent/go/deindent-function-closing-brace/out
new file mode 100644
index 00000000..a5a15ced
--- /dev/null
+++ b/test/indent/go/deindent-function-closing-brace/out
@@ -0,0 +1,17 @@
+func foo(x int) int {
+}
+
+func foo(x int) int {
+    
+}
+
+func foo(x int) int {
+    bar()}
+
+func foo(x int) int {
+    bar()
+}
+
+func foo(x int) int {
+    bar()
+}
diff --git a/test/indent/go/deindent-function-closing-brace/rc b/test/indent/go/deindent-function-closing-brace/rc
new file mode 100644
index 00000000..1b0b0035
--- /dev/null
+++ b/test/indent/go/deindent-function-closing-brace/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/go.kak"
+set buffer filetype go
diff --git a/test/indent/go/deindent-generic-closing-brace/cmd b/test/indent/go/deindent-generic-closing-brace/cmd
new file mode 100644
index 00000000..e3036a40
--- /dev/null
+++ b/test/indent/go/deindent-generic-closing-brace/cmd
@@ -0,0 +1 @@
+c<ret>
diff --git a/test/indent/go/deindent-generic-closing-brace/in b/test/indent/go/deindent-generic-closing-brace/in
new file mode 100644
index 00000000..b2f7c26d
--- /dev/null
+++ b/test/indent/go/deindent-generic-closing-brace/in
@@ -0,0 +1,25 @@
+{%( )}
+
+{%( )
+}
+
+{%( )bar()}
+
+{%( )bar()
+}
+
+{
+    bar()%( )}
+
+{(%( ))}
+
+{(%( )
+)}
+
+{(%( )foo())}
+
+{(%( )foo()
+)}
+
+{(
+    bar()%( ))}
diff --git a/test/indent/go/deindent-generic-closing-brace/out b/test/indent/go/deindent-generic-closing-brace/out
new file mode 100644
index 00000000..58109817
--- /dev/null
+++ b/test/indent/go/deindent-generic-closing-brace/out
@@ -0,0 +1,35 @@
+{
+}
+
+{
+    
+}
+
+{
+    bar()}
+
+{
+    bar()
+}
+
+{
+    bar()
+}
+
+{(
+)}
+
+{(
+    
+)}
+
+{(
+    foo())}
+
+{(
+    foo()
+)}
+
+{(
+    bar()
+)}
diff --git a/test/indent/go/deindent-generic-closing-brace/rc b/test/indent/go/deindent-generic-closing-brace/rc
new file mode 100644
index 00000000..1b0b0035
--- /dev/null
+++ b/test/indent/go/deindent-generic-closing-brace/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/go.kak"
+set buffer filetype go
diff --git a/test/indent/go/deindent-if-closing-brace/cmd b/test/indent/go/deindent-if-closing-brace/cmd
new file mode 100644
index 00000000..e3036a40
--- /dev/null
+++ b/test/indent/go/deindent-if-closing-brace/cmd
@@ -0,0 +1 @@
+c<ret>
diff --git a/test/indent/go/deindent-if-closing-brace/in b/test/indent/go/deindent-if-closing-brace/in
new file mode 100644
index 00000000..d5f59de0
--- /dev/null
+++ b/test/indent/go/deindent-if-closing-brace/in
@@ -0,0 +1,12 @@
+if true {%( )}
+
+if true {%( )
+}
+
+if true {%( )bar()}
+
+if true {%( )bar()
+}
+
+if true {
+    bar()%( )}
diff --git a/test/indent/go/deindent-if-closing-brace/out b/test/indent/go/deindent-if-closing-brace/out
new file mode 100644
index 00000000..2c63bd1c
--- /dev/null
+++ b/test/indent/go/deindent-if-closing-brace/out
@@ -0,0 +1,17 @@
+if true {
+}
+
+if true {
+    
+}
+
+if true {
+    bar()}
+
+if true {
+    bar()
+}
+
+if true {
+    bar()
+}
diff --git a/test/indent/go/deindent-if-closing-brace/rc b/test/indent/go/deindent-if-closing-brace/rc
new file mode 100644
index 00000000..1b0b0035
--- /dev/null
+++ b/test/indent/go/deindent-if-closing-brace/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/go.kak"
+set buffer filetype go