diff --git a/idea/testData/templates/void.exp.kt b/idea/testData/templates/void.exp.kt
new file mode 100644
index 00000000000..50da812f4df
--- /dev/null
+++ b/idea/testData/templates/void.exp.kt
@@ -0,0 +1,3 @@
+fun foo(x : Int) {
+    <caret>
+}
\ No newline at end of file
diff --git a/idea/testData/templates/void.kt b/idea/testData/templates/void.kt
new file mode 100644
index 00000000000..81389d50841
--- /dev/null
+++ b/idea/testData/templates/void.kt
@@ -0,0 +1 @@
+<caret>
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/LiveTemplatesTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/LiveTemplatesTest.java
index d0f3a4b3f9b..b1ec7e915c9 100644
--- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/LiveTemplatesTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/LiveTemplatesTest.java
@@ -134,6 +134,15 @@ public class LiveTemplatesTest extends LightCodeInsightFixtureTestCase {
         checkAfter();
     }
 
+    public void testVoid() {
+        start();
+
+        typeAndNextTab("foo");
+        typeAndNextTab("x : Int");
+
+        checkAfter();
+    }
+
     public void testIter() {
         start();