diff --git a/runtests/test/stdlib/testall/LanguageTestAllTest.java b/runtests/test/stdlib/testall/LanguageTestAllTest.java
index 3e4371e8e9e..65cc48fbb5e 100644
--- a/runtests/test/stdlib/testall/LanguageTestAllTest.java
+++ b/runtests/test/stdlib/testall/LanguageTestAllTest.java
@@ -23,6 +23,6 @@ import test.language.*;
  */
 public class LanguageTestAllTest {
   public static TestSuite suite() {
-    return new TestSuite(NullableCollectionsTest.class);
+    return new TestSuite(JavaClassTest.class, NullableCollectionsTest.class);
   }
 }
diff --git a/stdlib.ipr b/stdlib.ipr
index 227263bf56c..6b7dd4b98a5 100644
--- a/stdlib.ipr
+++ b/stdlib.ipr
@@ -2,6 +2,14 @@
 <project version="4">
   <component name="AntConfiguration">
     <defaultAnt bundledAnt="true" />
+    <buildFile url="file://$PROJECT_DIR$/build.xml">
+      <additionalClassPath />
+      <antReference projectDefault="true" />
+      <customJdkName value="" />
+      <maximumHeapSize value="128" />
+      <maximumStackSize value="2" />
+      <properties />
+    </buildFile>
   </component>
   <component name="CompilerConfiguration">
     <option name="DEFAULT_COMPILER" value="Javac" />
@@ -68,6 +76,9 @@
   </component>
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/kdoc/kdoc.iml" filepath="$PROJECT_DIR$/kdoc/kdoc.iml" />
+      <module fileurl="file://$PROJECT_DIR$/kunit/kunit.iml" filepath="$PROJECT_DIR$/kunit/kunit.iml" />
+      <module fileurl="file://$PROJECT_DIR$/modules/modules.iml" filepath="$PROJECT_DIR$/modules/modules.iml" />
       <module fileurl="file://$PROJECT_DIR$/runtests/runtests.iml" filepath="$PROJECT_DIR$/runtests/runtests.iml" />
       <module fileurl="file://$PROJECT_DIR$/stdlib/stdlib.iml" filepath="$PROJECT_DIR$/stdlib/stdlib.iml" />
       <module fileurl="file://$PROJECT_DIR$/testlib/testlib.iml" filepath="$PROJECT_DIR$/testlib/testlib.iml" />
@@ -82,5 +93,14 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
   </component>
+  <component name="libraryTable">
+    <library name="KotlinRuntime">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/lib/kotlin-runtime.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+  </component>
 </project>
 
diff --git a/stdlib/ktSrc/org/jetbrains/kotlin/support/AsserterLoader.kt b/stdlib/ktSrc/org/jetbrains/kotlin/support/AsserterLoader.kt
new file mode 100644
index 00000000000..9720634c929
--- /dev/null
+++ b/stdlib/ktSrc/org/jetbrains/kotlin/support/AsserterLoader.kt
@@ -0,0 +1,6 @@
+package org.jetbrains.kotlin.support
+
+fun loadAsserter(): Unit {
+    val c = javaClass<Runnable>()
+    println("class is $c")
+}
\ No newline at end of file
diff --git a/testlib/test/language/JavaClassTest.kt b/testlib/test/language/JavaClassTest.kt
new file mode 100644
index 00000000000..12ccb3b5bf1
--- /dev/null
+++ b/testlib/test/language/JavaClassTest.kt
@@ -0,0 +1,16 @@
+package test.language
+
+import junit.framework.TestCase
+import kotlin.test.*
+
+import org.jetbrains.kotlin.support.*
+
+class JavaClassTest : TestCase() {
+
+    fun testJavaClass() {
+        // TODO this function fails!
+        // see KT-1515
+        // loadAsserter()
+    }
+}
+