diff --git a/idea/testData/templates/exfun.exp.kt b/idea/testData/templates/exfun.exp.kt
new file mode 100644
index 00000000000..62b7baae450
--- /dev/null
+++ b/idea/testData/templates/exfun.exp.kt
@@ -0,0 +1,3 @@
+fun Int.foo(arg : Int) : Unit {
+    <caret>
+}
\ No newline at end of file
diff --git a/idea/testData/templates/exfun.kt b/idea/testData/templates/exfun.kt
new file mode 100644
index 00000000000..81389d50841
--- /dev/null
+++ b/idea/testData/templates/exfun.kt
@@ -0,0 +1 @@
+<caret>
\ No newline at end of file
diff --git a/idea/testData/templates/exval.exp.kt b/idea/testData/templates/exval.exp.kt
new file mode 100644
index 00000000000..f3e8ea4ec7a
--- /dev/null
+++ b/idea/testData/templates/exval.exp.kt
@@ -0,0 +1,4 @@
+val Int.v : Int
+get() {
+    <caret>
+}
\ No newline at end of file
diff --git a/idea/testData/templates/exval.kt b/idea/testData/templates/exval.kt
new file mode 100644
index 00000000000..81389d50841
--- /dev/null
+++ b/idea/testData/templates/exval.kt
@@ -0,0 +1 @@
+<caret>
\ No newline at end of file
diff --git a/idea/testData/templates/exvar.exp.kt b/idea/testData/templates/exvar.exp.kt
new file mode 100644
index 00000000000..bf56eeac055
--- /dev/null
+++ b/idea/testData/templates/exvar.exp.kt
@@ -0,0 +1,7 @@
+var Int.v : Int
+get() {
+    <caret>
+}
+set(value) {
+
+}
\ No newline at end of file
diff --git a/idea/testData/templates/exvar.kt b/idea/testData/templates/exvar.kt
new file mode 100644
index 00000000000..81389d50841
--- /dev/null
+++ b/idea/testData/templates/exvar.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 879d56a5935..cd97e7680bb 100644
--- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/LiveTemplatesTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/LiveTemplatesTest.java
@@ -42,8 +42,7 @@ public class LiveTemplatesTest extends LightCodeInsightFixtureTestCase {
         start();
         
         assertStringItems("args", "x", "y");
-        type("y");
-        nextTab();
+        typeAndNext("y");
 
         checkAfter();
     }
@@ -79,6 +78,42 @@ public class LiveTemplatesTest extends LightCodeInsightFixtureTestCase {
         checkAfter();
     }
 
+    public void testExfun() {
+        start();
+
+        typeAndNext("Int");
+        typeAndNext("foo");
+        typeAndNext("arg : Int");
+        nextTab();
+
+        checkAfter();
+    }
+
+    public void testExval() {
+        start();
+
+        typeAndNext("Int");
+        nextTab();
+        typeAndNext("Int");
+
+        checkAfter();
+    }
+
+    public void testExvar() {
+        start();
+
+        typeAndNext("Int");
+        nextTab();
+        typeAndNext("Int");
+
+        checkAfter();
+    }
+
+    private void typeAndNext(String s) {
+        type(s);
+        nextTab();
+    }
+
     public void testIter() {
         start();