diff --git a/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java b/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java
index 44244460da5..9c050d478aa 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java
@@ -111,82 +111,4 @@ public class StdlibTest extends CodegenTestCase {
     public void testKt274 () {
 //        blackBoxFile("regressions/kt274.kt");
     }
-
-    public void testTestlib () {
-        try {
-            CompileSession session = new CompileSession(myEnvironment);
-            CompileEnvironment.initializeKotlinRuntime(myEnvironment);
-            URLClassLoader classLoader = (URLClassLoader) TestCase.class.getClassLoader();
-            CoreLocalFileSystem localFileSystem = myEnvironment.getLocalFileSystem();
-            for(URL url: classLoader.getURLs()) {
-                if(url.getProtocol().equals("file") && url.getPath().contains("junit")) {
-                    File file = new File(URLDecoder.decode(url.getPath()));
-                    if(file.exists()) {
-                        myEnvironment.addToClasspath(file);
-                    }
-                }
-            }
-            VirtualFile path = localFileSystem.findFileByPath(JetParsingTest.getTestDataDir() + "/../../testlib/test");
-            session.addSources(path);
-            session.addStdLibSources(true);
-
-            if (!session.analyze(System.out)) {
-                throw new RuntimeException();
-            }
-
-            ClassFileFactory classFileFactory = session.generate();
-            GeneratedClassLoader loader = new GeneratedClassLoader(classFileFactory);
-            
-            JetTypeMapper typeMapper = new JetTypeMapper(classFileFactory.state.getStandardLibrary(), session.getMyBindingContext());
-            TestSuite suite = new TestSuite("StandardLibrary");
-            try {
-                for(JetFile jetFile : session.getSourceFileNamespaces()) {
-                    for(JetDeclaration decl : jetFile.getDeclarations()) {
-                        if(decl instanceof JetClass) {
-                            JetClass jetClass = (JetClass) decl;
-
-                            ClassDescriptor descriptor = (ClassDescriptor) session.getMyBindingContext().get(BindingContext.DECLARATION_TO_DESCRIPTOR, jetClass);
-                            Set<JetType> allSuperTypes = new THashSet<JetType>();
-                            CodegenUtil.addSuperTypes(descriptor.getDefaultType(), allSuperTypes);
-
-                            for(JetType type : allSuperTypes) {
-                                String internalName = typeMapper.mapType(type).getInternalName();
-                                if(internalName.equals("junit/framework/Test")) {
-                                    String name = typeMapper.mapType(descriptor.getDefaultType()).getInternalName();
-                                    System.out.println(name);
-                                    Class<TestCase> aClass = (Class<TestCase>) loader.loadClass(name.replace('/', '.'));
-                                    if((aClass.getModifiers() & Modifier.ABSTRACT) == 0
-                                     && (aClass.getModifiers() & Modifier.PUBLIC) != 0) {
-                                        try {
-                                            Constructor<TestCase> constructor = aClass.getConstructor();
-                                            if(constructor != null && (constructor.getModifiers() & Modifier.PUBLIC) != 0) {
-                                                suite.addTestSuite(aClass);
-                                            }
-                                        }
-                                        catch (NoSuchMethodException e) {
-                                        }
-                                    }
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            finally {
-                typeMapper = null;
-            }
-
-            TestResult testResult = TestRunner.run(suite);
-            assertEquals(0, testResult.errorCount());
-            assertEquals(0, testResult.failureCount());
-
-
-        } catch (RuntimeException e) {
-            System.out.println(generateToText());
-            throw e;
-        } catch (Throwable e) {
-            throw new RuntimeException(e);
-        }
-    }
 }
diff --git a/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java b/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java
new file mode 100644
index 00000000000..025227b1e6d
--- /dev/null
+++ b/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java
@@ -0,0 +1,133 @@
+package org.jetbrains.jet.codegen;
+
+import com.intellij.openapi.Disposable;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.vfs.local.CoreLocalFileSystem;
+import gnu.trove.THashSet;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import org.jetbrains.jet.JetCoreEnvironment;
+import org.jetbrains.jet.compiler.CompileEnvironment;
+import org.jetbrains.jet.compiler.CompileSession;
+import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
+import org.jetbrains.jet.lang.psi.JetClass;
+import org.jetbrains.jet.lang.psi.JetDeclaration;
+import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.jet.lang.resolve.BindingContext;
+import org.jetbrains.jet.lang.types.JetType;
+import org.jetbrains.jet.parsing.JetParsingTest;
+
+import java.io.File;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Modifier;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.net.URLDecoder;
+import java.util.Set;
+
+/**
+ * @author alex.tkachman
+ */
+public class TestlibTest extends CodegenTestCase {
+    public static TestSuite suite() {
+        TestlibTest testlibTest = new TestlibTest();
+        try {
+            testlibTest.setUp();
+            return testlibTest.buildSuite();
+        } catch (RuntimeException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        finally {
+            try {
+                testlibTest.tearDown();
+            } catch (RuntimeException e) {
+                throw e;
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+    }
+    
+    public TestSuite buildSuite () {
+        try {
+            CompileSession session = new CompileSession(myEnvironment);
+            CompileEnvironment.initializeKotlinRuntime(myEnvironment);
+            URLClassLoader classLoader = (URLClassLoader) TestCase.class.getClassLoader();
+            CoreLocalFileSystem localFileSystem = myEnvironment.getLocalFileSystem();
+            for(URL url: classLoader.getURLs()) {
+                if(url.getProtocol().equals("file") && url.getPath().contains("junit")) {
+                    File file = new File(URLDecoder.decode(url.getPath()));
+                    if(file.exists()) {
+                        myEnvironment.addToClasspath(file);
+                    }
+                }
+            }
+            VirtualFile path = localFileSystem.findFileByPath(JetParsingTest.getTestDataDir() + "/../../testlib/test");
+            session.addSources(path);
+            session.addStdLibSources(true);
+
+            if (!session.analyze(System.out)) {
+                throw new RuntimeException();
+            }
+
+            ClassFileFactory classFileFactory = session.generate();
+            GeneratedClassLoader loader = new GeneratedClassLoader(classFileFactory);
+
+            JetTypeMapper typeMapper = new JetTypeMapper(classFileFactory.state.getStandardLibrary(), session.getMyBindingContext());
+            TestSuite suite = new TestSuite("StandardLibrary");
+            try {
+                for(JetFile jetFile : session.getSourceFileNamespaces()) {
+                    for(JetDeclaration decl : jetFile.getDeclarations()) {
+                        if(decl instanceof JetClass) {
+                            JetClass jetClass = (JetClass) decl;
+
+                            ClassDescriptor descriptor = (ClassDescriptor) session.getMyBindingContext().get(BindingContext.DECLARATION_TO_DESCRIPTOR, jetClass);
+                            Set<JetType> allSuperTypes = new THashSet<JetType>();
+                            CodegenUtil.addSuperTypes(descriptor.getDefaultType(), allSuperTypes);
+
+                            for(JetType type : allSuperTypes) {
+                                String internalName = typeMapper.mapType(type).getInternalName();
+                                if(internalName.equals("junit/framework/Test")) {
+                                    String name = typeMapper.mapType(descriptor.getDefaultType()).getInternalName();
+                                    System.out.println(name);
+                                    Class<TestCase> aClass = (Class<TestCase>) loader.loadClass(name.replace('/', '.'));
+                                    if((aClass.getModifiers() & Modifier.ABSTRACT) == 0
+                                     && (aClass.getModifiers() & Modifier.PUBLIC) != 0) {
+                                        try {
+                                            Constructor<TestCase> constructor = aClass.getConstructor();
+                                            if(constructor != null && (constructor.getModifiers() & Modifier.PUBLIC) != 0) {
+                                                suite.addTestSuite(aClass);
+                                            }
+                                        }
+                                        catch (NoSuchMethodException e) {
+                                        }
+                                    }
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            finally {
+                typeMapper = null;
+            }
+
+            return suite;
+
+        } catch (RuntimeException e) {
+            throw e;
+        } catch (Throwable e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        createEnvironmentWithFullJdk();
+    }
+}