diff --git a/test/indent/elixir/following-blocks-should-not-prevent-end/cmd b/test/indent/elixir/following-blocks-should-not-prevent-end/cmd
new file mode 100644
index 00000000..76003030
--- /dev/null
+++ b/test/indent/elixir/following-blocks-should-not-prevent-end/cmd
@@ -0,0 +1 @@
+c<ret><esc>
diff --git a/test/indent/elixir/following-blocks-should-not-prevent-end/in b/test/indent/elixir/following-blocks-should-not-prevent-end/in
new file mode 100644
index 00000000..5d7be301
--- /dev/null
+++ b/test/indent/elixir/following-blocks-should-not-prevent-end/in
@@ -0,0 +1,4 @@
+def foo() do%( )
+
+def bar() do
+end
diff --git a/test/indent/elixir/following-blocks-should-not-prevent-end/out b/test/indent/elixir/following-blocks-should-not-prevent-end/out
new file mode 100644
index 00000000..661652a2
--- /dev/null
+++ b/test/indent/elixir/following-blocks-should-not-prevent-end/out
@@ -0,0 +1,6 @@
+def foo() do
+
+end
+
+def bar() do
+end
diff --git a/test/indent/elixir/following-blocks-should-not-prevent-end/rc b/test/indent/elixir/following-blocks-should-not-prevent-end/rc
new file mode 100644
index 00000000..5cc4387c
--- /dev/null
+++ b/test/indent/elixir/following-blocks-should-not-prevent-end/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/elixir.kak"
+set buffer filetype elixir
diff --git a/test/indent/elixir/function-definition-shouldnt-duplicate/cmd b/test/indent/elixir/function-definition-shouldnt-duplicate/cmd
new file mode 100644
index 00000000..76003030
--- /dev/null
+++ b/test/indent/elixir/function-definition-shouldnt-duplicate/cmd
@@ -0,0 +1 @@
+c<ret><esc>
diff --git a/test/indent/elixir/function-definition-shouldnt-duplicate/in b/test/indent/elixir/function-definition-shouldnt-duplicate/in
new file mode 100644
index 00000000..12dbbdd4
--- /dev/null
+++ b/test/indent/elixir/function-definition-shouldnt-duplicate/in
@@ -0,0 +1,3 @@
+defmodule Module do
+    def test do%( )
+end
diff --git a/test/indent/elixir/function-definition-shouldnt-duplicate/out b/test/indent/elixir/function-definition-shouldnt-duplicate/out
new file mode 100644
index 00000000..d0a93b49
--- /dev/null
+++ b/test/indent/elixir/function-definition-shouldnt-duplicate/out
@@ -0,0 +1,5 @@
+defmodule Module do
+    def test do
+
+    end
+end
diff --git a/test/indent/elixir/function-definition-shouldnt-duplicate/rc b/test/indent/elixir/function-definition-shouldnt-duplicate/rc
new file mode 100644
index 00000000..5cc4387c
--- /dev/null
+++ b/test/indent/elixir/function-definition-shouldnt-duplicate/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/elixir.kak"
+set buffer filetype elixir