diff --git a/compiler/testData/renderer/Classes.kt b/compiler/testData/renderer/Classes.kt
new file mode 100644
index 00000000000..ecdd7945e3c
--- /dev/null
+++ b/compiler/testData/renderer/Classes.kt
@@ -0,0 +1,49 @@
+package rendererTest
+
+annotation class TheAnnotation {
+}
+
+[TheAnnotation]
+public open class TheClass<out T : Int, X> {
+  private val privateVal : Int = 5
+
+  val shouldBeFinal : Int = 5
+
+  protected abstract fun foo() {}
+
+  private class Inner {}
+}
+
+internal class InternalClass {
+}
+
+trait TheTrait {
+  fun abstractFun()
+
+  class object : TheClass<Int, Int> {
+    fun classObjectFunction() : Int {}
+  }
+}
+
+private enum class TheEnum(val rgb : Int) {
+    VAL1 : TheEnum(0xFF0000)
+}
+
+//package rendererTest defined in <module>.<root>
+//internal final annotation class TheAnnotation defined in <module>.<root>.rendererTest
+//public open class TheClass<T : jet.Int, X> defined in <module>.<root>.rendererTest
+//<T : jet.Int> defined in <module>.<root>.rendererTest.TheClass
+//<X> defined in <module>.<root>.rendererTest.TheClass
+//private final val privateVal : jet.Int defined in <module>.<root>.rendererTest.TheClass
+//internal final val shouldBeFinal : jet.Int defined in <module>.<root>.rendererTest.TheClass
+//protected abstract fun foo() : Unit defined in <module>.<root>.rendererTest.TheClass
+//private final class Inner defined in <module>.<root>.rendererTest.TheClass
+//internal final class InternalClass defined in <module>.<root>.rendererTest
+//internal trait TheTrait defined in <module>.<root>.rendererTest
+//internal abstract fun abstractFun() : Unit defined in <module>.<root>.rendererTest.TheTrait
+//object : rendererTest.TheClass<jet.Int, jet.Int> defined in <module>.<root>.rendererTest.TheTrait
+//internal final fun classObjectFunction() : jet.Int defined in <module>.<root>.rendererTest.TheTrait.<no name provided>
+//private final enum class TheEnum defined in <module>.<root>.rendererTest
+//value-parameter val rgb : jet.Int defined in <module>.<root>.rendererTest.TheEnum.<init>
+//internal final class VAL1 : rendererTest.TheEnum defined in <module>.<root>.rendererTest.TheEnum.class-object-for-TheEnum
+//internal final val VAL1 : rendererTest.TheEnum.class-object-for-TheEnum.VAL1 defined in <module>.<root>.rendererTest.TheEnum.class-object-for-TheEnum
diff --git a/compiler/testData/renderer/FunctionTypes.kt b/compiler/testData/renderer/FunctionTypes.kt
new file mode 100644
index 00000000000..4dd0ede9ded
--- /dev/null
+++ b/compiler/testData/renderer/FunctionTypes.kt
@@ -0,0 +1,18 @@
+var v1 : () -> Tuple0
+var v2 : (Int) -> Int
+var v3 : (Int, #(String, String)) -> String
+var v4 : Function1<Int, String>
+var v4 : (() -> Int, (#(String, String)) -> Tuple0) -> String
+var v5 : Int.() -> Int
+var v6  : Int.(String, Int) -> Unit
+var v7  : ExtensionFunction1<Int, String, Boolean>
+
+
+//internal final var v1 : () -> Unit defined in <module>.<root>.
+//internal final var v2 : (jet.Int) -> jet.Int defined in <module>.<root>.
+//internal final var v3 : (jet.Int, #(jet.String, jet.String)) -> jet.String defined in <module>.<root>.
+//internal final var v4 : (jet.Int) -> jet.String defined in <module>.<root>.
+//internal final var v4 : (() -> jet.Int, (#(jet.String, jet.String)) -> Unit) -> jet.String defined in <module>.<root>.
+//internal final var v5 : jet.Int.() -> jet.Int defined in <module>.<root>.
+//internal final var v6 : jet.Int.(jet.String, jet.Int) -> Unit defined in <module>.<root>.
+//internal final var v7 : jet.Int.(jet.String) -> jet.Boolean defined in <module>.<root>.
diff --git a/compiler/testData/renderer/TupleTypes.kt b/compiler/testData/renderer/TupleTypes.kt
new file mode 100644
index 00000000000..b1a9adc24f7
--- /dev/null
+++ b/compiler/testData/renderer/TupleTypes.kt
@@ -0,0 +1,21 @@
+var v1 : Tuple0
+var v2 : Tuple0?
+var v3 : Unit
+var v4 : Unit?
+var v5 : #()
+var v6 : #(Int)
+var v7 : #(Int)?
+var v8 : #(Int, String, String)
+var v9 : Tuple2<Int, String>
+var v10 : Tuple3<Int, Int, Int>?
+
+//internal final var v1 : Unit defined in <module>.<root>.
+//internal final var v2 : Unit? defined in <module>.<root>.
+//internal final var v3 : Unit defined in <module>.<root>.
+//internal final var v4 : Unit? defined in <module>.<root>.
+//internal final var v5 : Unit defined in <module>.<root>.
+//internal final var v6 : #(jet.Int) defined in <module>.<root>.
+//internal final var v7 : #(jet.Int)? defined in <module>.<root>.
+//internal final var v8 : #(jet.Int, jet.String, jet.String) defined in <module>.<root>.
+//internal final var v9 : #(jet.Int, jet.String) defined in <module>.<root>.
+//internal final var v10 : #(jet.Int, jet.Int, jet.Int)? defined in <module>.<root>.
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/jet/resolve/DescriptorRendererTest.java b/compiler/tests/org/jetbrains/jet/resolve/DescriptorRendererTest.java
index ec67e5dbd60..083e570bc9a 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/DescriptorRendererTest.java
+++ b/compiler/tests/org/jetbrains/jet/resolve/DescriptorRendererTest.java
@@ -47,6 +47,18 @@ public class DescriptorRendererTest extends JetLiteFixture {
         doTest();
     }
 
+    public void testClasses() throws IOException {
+        doTest();
+    }
+
+    public void testTupleTypes() throws IOException {
+        doTest();
+    }
+
+    public void testFunctionTypes() throws IOException {
+        doTest();
+    }
+
     @Override
     protected String getTestDataPath() {
         return JetTestCaseBuilder.getTestDataPathBase() + "/renderer";