diff --git a/compiler/tests/org/jetbrains/jet/MockLibraryUtil.java b/compiler/tests/org/jetbrains/jet/MockLibraryUtil.java
index c24d2c435af..4eaca823538 100644
--- a/compiler/tests/org/jetbrains/jet/MockLibraryUtil.java
+++ b/compiler/tests/org/jetbrains/jet/MockLibraryUtil.java
@@ -89,16 +89,22 @@ public class MockLibraryUtil {
 
     // Runs compiler in custom class loader to avoid effects caused by replacing Application with another one created in compiler.
     public static void compileKotlin(@NotNull String sourcesPath, @NotNull File outDir) {
+        compileKotlin(sourcesPath, outDir, sourcesPath);
+    }
+
+    public static void compileKotlin(@NotNull String sourcesPath, @NotNull File outDir, @NotNull String classpath) {
         try {
             ByteArrayOutputStream outStream = new ByteArrayOutputStream();
             Class<?> compilerClass = getCompilerClass();
             Object compilerObject = compilerClass.newInstance();
             Method execMethod = compilerClass.getMethod("exec", PrintStream.class, String[].class);
 
+            String newClasspath = classpath.contains(sourcesPath) ? classpath : classpath + File.pathSeparator + sourcesPath;
+
             //noinspection IOResourceOpenedButNotSafelyClosed
             Enum<?> invocationResult = (Enum<?>) execMethod.invoke(
                     compilerObject, new PrintStream(outStream),
-                    new String[] {sourcesPath, "-d", outDir.getAbsolutePath(), "-classpath", sourcesPath}
+                    new String[] {sourcesPath, "-d", outDir.getAbsolutePath(), "-classpath", newClasspath}
             );
 
             assertEquals(new String(outStream.toByteArray()), ExitCode.OK.name(), invocationResult.name());
diff --git a/idea/testData/debugger/tinyApp/customLibrary/oneFunSameFileName/1/1.kt b/idea/testData/debugger/tinyApp/customLibrary/oneFunSameFileName/1/1.kt
new file mode 100644
index 00000000000..fc32dbe9cb0
--- /dev/null
+++ b/idea/testData/debugger/tinyApp/customLibrary/oneFunSameFileName/1/1.kt
@@ -0,0 +1,5 @@
+package customLib.oneFunSameFileName
+
+public fun oneFunSameFileNameFun(): Int {
+    return 1
+}
\ No newline at end of file
diff --git a/idea/testData/debugger/tinyApp/customLibrary/oneFunSameFileName/2/1.kt b/idea/testData/debugger/tinyApp/customLibrary/oneFunSameFileName/2/1.kt
new file mode 100644
index 00000000000..0734de8f3e3
--- /dev/null
+++ b/idea/testData/debugger/tinyApp/customLibrary/oneFunSameFileName/2/1.kt
@@ -0,0 +1,5 @@
+package customLib.oneFunSameFileName
+
+public fun oneFunSameFileNameFun2(): Int {
+    return 1
+}
\ No newline at end of file
diff --git a/idea/testData/debugger/tinyApp/customLibrary/twoFunDifferentSignature/1/1.kt b/idea/testData/debugger/tinyApp/customLibrary/twoFunDifferentSignature/1/1.kt
new file mode 100644
index 00000000000..73b9a4baa21
--- /dev/null
+++ b/idea/testData/debugger/tinyApp/customLibrary/twoFunDifferentSignature/1/1.kt
@@ -0,0 +1,5 @@
+package customLib.twoFunDifferentSignature
+
+public fun twoFunDifferentSignatureFun(): Int {
+    return 1
+}
\ No newline at end of file
diff --git a/idea/testData/debugger/tinyApp/customLibrary/twoFunDifferentSignature/2/1.kt b/idea/testData/debugger/tinyApp/customLibrary/twoFunDifferentSignature/2/1.kt
new file mode 100644
index 00000000000..2912f53a0b9
--- /dev/null
+++ b/idea/testData/debugger/tinyApp/customLibrary/twoFunDifferentSignature/2/1.kt
@@ -0,0 +1,5 @@
+package customLib.twoFunDifferentSignature
+
+public fun twoFunDifferentSignatureFun(i: Int): Int {
+    return 1
+}
\ No newline at end of file
diff --git a/idea/testData/debugger/tinyApp/outs/_kt.out b/idea/testData/debugger/tinyApp/outs/_kt.out
index 1a3b2fa0a68..c07ad4fee83 100644
--- a/idea/testData/debugger/tinyApp/outs/_kt.out
+++ b/idea/testData/debugger/tinyApp/outs/_kt.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at .kt.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! _DefaultPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! _DefaultPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 .kt.kt:4
 Compile bytecode for 1 + 1
diff --git a/idea/testData/debugger/tinyApp/outs/abstractFunCall.out b/idea/testData/debugger/tinyApp/outs/abstractFunCall.out
index eef77767d00..d34e66fc2b8 100644
--- a/idea/testData/debugger/tinyApp/outs/abstractFunCall.out
+++ b/idea/testData/debugger/tinyApp/outs/abstractFunCall.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at abstractFunCall.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! abstractFunCall.AbstractFunCallPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! abstractFunCall.AbstractFunCallPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 abstractFunCall.kt:4
 Compile bytecode for (1 as java.lang.Number).intValue()
diff --git a/idea/testData/debugger/tinyApp/outs/arrays.out b/idea/testData/debugger/tinyApp/outs/arrays.out
index 3f35b7c44b9..c990987eb25 100644
--- a/idea/testData/debugger/tinyApp/outs/arrays.out
+++ b/idea/testData/debugger/tinyApp/outs/arrays.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at arrays.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! arrays.ArraysPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! arrays.ArraysPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 arrays.kt:4
 Compile bytecode for array(1, 2).map { it.toString() }
diff --git a/idea/testData/debugger/tinyApp/outs/classFromAnotherPackage.out b/idea/testData/debugger/tinyApp/outs/classFromAnotherPackage.out
index 6dbcb1bcad4..87ba8172a64 100644
--- a/idea/testData/debugger/tinyApp/outs/classFromAnotherPackage.out
+++ b/idea/testData/debugger/tinyApp/outs/classFromAnotherPackage.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at classFromAnotherPackage.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! classFromAnotherPackage.ClassFromAnotherPackagePackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! classFromAnotherPackage.ClassFromAnotherPackagePackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 classFromAnotherPackage.kt:6
 Compile bytecode for MyJavaClass()
diff --git a/idea/testData/debugger/tinyApp/outs/classObjectFunFromClass.out b/idea/testData/debugger/tinyApp/outs/classObjectFunFromClass.out
index 8a3dfd43689..6d6987949ac 100644
--- a/idea/testData/debugger/tinyApp/outs/classObjectFunFromClass.out
+++ b/idea/testData/debugger/tinyApp/outs/classObjectFunFromClass.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at classObjectFunFromClass.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! classObjectFunFromClass.ClassObjectFunFromClassPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! classObjectFunFromClass.ClassObjectFunFromClassPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 classObjectFunFromClass.kt:5
 classObjectFunFromClass.kt:10
diff --git a/idea/testData/debugger/tinyApp/outs/classObjectFunFromTopLevel.out b/idea/testData/debugger/tinyApp/outs/classObjectFunFromTopLevel.out
index be593d9e52d..ca103b1308d 100644
--- a/idea/testData/debugger/tinyApp/outs/classObjectFunFromTopLevel.out
+++ b/idea/testData/debugger/tinyApp/outs/classObjectFunFromTopLevel.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at classObjectFunFromTopLevel.kt:13
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! classObjectFunFromTopLevel.ClassObjectFunFromTopLevelPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! classObjectFunFromTopLevel.ClassObjectFunFromTopLevelPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 classObjectFunFromTopLevel.kt:12
 classObjectFunFromTopLevel.kt:5
diff --git a/idea/testData/debugger/tinyApp/outs/classObjectVal.out b/idea/testData/debugger/tinyApp/outs/classObjectVal.out
index a347b06cd23..ac5f0bde7c6 100644
--- a/idea/testData/debugger/tinyApp/outs/classObjectVal.out
+++ b/idea/testData/debugger/tinyApp/outs/classObjectVal.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at classObjectVal.kt:10
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! classObjectVal.ClassObjectValPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! classObjectVal.ClassObjectValPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 classObjectVal.kt:9
 Compile bytecode for coProp
diff --git a/idea/testData/debugger/tinyApp/outs/clearCache.out b/idea/testData/debugger/tinyApp/outs/clearCache.out
index 1ea2db70d4c..177d8a47963 100644
--- a/idea/testData/debugger/tinyApp/outs/clearCache.out
+++ b/idea/testData/debugger/tinyApp/outs/clearCache.out
@@ -15,7 +15,7 @@ LineBreakpoint created at clearCache.kt:149
 LineBreakpoint created at clearCache.kt:154
 LineBreakpoint created at clearCache.kt:161
 LineBreakpoint created at clearCache.kt:169
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! clearCache.ClearCachePackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! clearCache.ClearCachePackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 clearCache.kt:11
 Compile bytecode for a
diff --git a/idea/testData/debugger/tinyApp/outs/collections.out b/idea/testData/debugger/tinyApp/outs/collections.out
index 8215589597b..c541fe3582a 100644
--- a/idea/testData/debugger/tinyApp/outs/collections.out
+++ b/idea/testData/debugger/tinyApp/outs/collections.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at collections.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! collections.CollectionsPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! collections.CollectionsPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 collections.kt:5
 Compile bytecode for arrayListOf(1, 2).map { it.toString() }
diff --git a/idea/testData/debugger/tinyApp/outs/dependentOnFile.out b/idea/testData/debugger/tinyApp/outs/dependentOnFile.out
index 33361887a66..a8c325eac5f 100644
--- a/idea/testData/debugger/tinyApp/outs/dependentOnFile.out
+++ b/idea/testData/debugger/tinyApp/outs/dependentOnFile.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at dependentOnFile.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! dependentOnFile.DependentOnFilePackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! dependentOnFile.DependentOnFilePackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 dependentOnFile.kt:4
 Compile bytecode for TestClass().testFun()
diff --git a/idea/testData/debugger/tinyApp/outs/doubles.out b/idea/testData/debugger/tinyApp/outs/doubles.out
index 9028781bd0b..ab00294a53d 100644
--- a/idea/testData/debugger/tinyApp/outs/doubles.out
+++ b/idea/testData/debugger/tinyApp/outs/doubles.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at doubles.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! doubles.DoublesPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! doubles.DoublesPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 doubles.kt:6
 Compile bytecode for d1 + d2
diff --git a/idea/testData/debugger/tinyApp/outs/enums.out b/idea/testData/debugger/tinyApp/outs/enums.out
index 9c475e903b1..eae03d25053 100644
--- a/idea/testData/debugger/tinyApp/outs/enums.out
+++ b/idea/testData/debugger/tinyApp/outs/enums.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at enums.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! enums.EnumsPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! enums.EnumsPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 enums.kt:6
 Compile bytecode for A == MyEnum.A
diff --git a/idea/testData/debugger/tinyApp/outs/errors.out b/idea/testData/debugger/tinyApp/outs/errors.out
index 0194388cae3..b11f131e890 100644
--- a/idea/testData/debugger/tinyApp/outs/errors.out
+++ b/idea/testData/debugger/tinyApp/outs/errors.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at errors.kt:13
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! errors.ErrorsPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! errors.ErrorsPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 errors.kt:12
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
diff --git a/idea/testData/debugger/tinyApp/outs/exceptions.out b/idea/testData/debugger/tinyApp/outs/exceptions.out
index 2491cf5912d..ed886b46e58 100644
--- a/idea/testData/debugger/tinyApp/outs/exceptions.out
+++ b/idea/testData/debugger/tinyApp/outs/exceptions.out
@@ -4,7 +4,7 @@ LineBreakpoint created at exceptions.kt:26
 LineBreakpoint created at exceptions.kt:31
 LineBreakpoint created at exceptions.kt:42
 LineBreakpoint created at exceptions.kt:51
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! exceptions.ExceptionsPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! exceptions.ExceptionsPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 exceptions.kt:8
 Compile bytecode for fail()
diff --git a/idea/testData/debugger/tinyApp/outs/extFun.out b/idea/testData/debugger/tinyApp/outs/extFun.out
index d49bb9e2a4d..94280ee0c90 100644
--- a/idea/testData/debugger/tinyApp/outs/extFun.out
+++ b/idea/testData/debugger/tinyApp/outs/extFun.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at extFun.kt:12
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! extFun.ExtFunPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! extFun.ExtFunPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 extFun.kt:11
 extFun.kt:5
diff --git a/idea/testData/debugger/tinyApp/outs/extractLocalVariables.out b/idea/testData/debugger/tinyApp/outs/extractLocalVariables.out
index e8c4407ba13..b7c43dcb891 100644
--- a/idea/testData/debugger/tinyApp/outs/extractLocalVariables.out
+++ b/idea/testData/debugger/tinyApp/outs/extractLocalVariables.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at extractLocalVariables.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! extractLocalVariables.ExtractLocalVariablesPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! extractLocalVariables.ExtractLocalVariablesPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 extractLocalVariables.kt:6
 Compile bytecode for a
diff --git a/idea/testData/debugger/tinyApp/outs/extractThis.out b/idea/testData/debugger/tinyApp/outs/extractThis.out
index fdbf81651b5..33bbe9c3271 100644
--- a/idea/testData/debugger/tinyApp/outs/extractThis.out
+++ b/idea/testData/debugger/tinyApp/outs/extractThis.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at extractThis.kt:13
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! extractThis.ExtractThisPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! extractThis.ExtractThisPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 extractThis.kt:12
 Compile bytecode for prop
diff --git a/idea/testData/debugger/tinyApp/outs/extractVariablesFromCall.out b/idea/testData/debugger/tinyApp/outs/extractVariablesFromCall.out
index 77392f6796a..622a2b036f2 100644
--- a/idea/testData/debugger/tinyApp/outs/extractVariablesFromCall.out
+++ b/idea/testData/debugger/tinyApp/outs/extractVariablesFromCall.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at extractVariablesFromCall.kt:8
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! extractVariablesFromCall.ExtractVariablesFromCallPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! extractVariablesFromCall.ExtractVariablesFromCallPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 extractVariablesFromCall.kt:7
 Compile bytecode for f1(a, s)
diff --git a/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out b/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out
index 1967eb47abd..56015b6b0e4 100644
--- a/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out
+++ b/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at frameAnonymousObject.kt:11
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! frameAnonymousObject.FrameAnonymousObjectPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameAnonymousObject.FrameAnonymousObjectPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 frameAnonymousObject.kt:10
 package frameAnonymousObject
diff --git a/idea/testData/debugger/tinyApp/outs/frameClassObject.out b/idea/testData/debugger/tinyApp/outs/frameClassObject.out
index 11dc39ce6e2..b3ff356476d 100644
--- a/idea/testData/debugger/tinyApp/outs/frameClassObject.out
+++ b/idea/testData/debugger/tinyApp/outs/frameClassObject.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at frameClassObject.kt:15
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! frameClassObject.FrameClassObjectPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameClassObject.FrameClassObjectPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 frameClassObject.kt:14
 Compile bytecode for prop
diff --git a/idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out b/idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out
index e7769a2da7c..8a04aae47cc 100644
--- a/idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out
+++ b/idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at frameExtFunExtFun.kt:22
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! frameExtFunExtFun.FrameExtFunExtFunPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameExtFunExtFun.FrameExtFunExtFunPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 frameExtFunExtFun.kt:21
 Compile bytecode for valFoo
diff --git a/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out b/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out
index e7c86083da6..2b23686bb82 100644
--- a/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out
+++ b/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at frameExtensionFun.kt:13
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! frameExtensionFun.FrameExtensionFunPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameExtensionFun.FrameExtensionFunPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 frameExtensionFun.kt:12
 Compile bytecode for prop
diff --git a/idea/testData/debugger/tinyApp/outs/frameInnerClass.out b/idea/testData/debugger/tinyApp/outs/frameInnerClass.out
index d22a92b8bc7..09b2940bc5d 100644
--- a/idea/testData/debugger/tinyApp/outs/frameInnerClass.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInnerClass.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at frameInnerClass.kt:15
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! frameInnerClass.FrameInnerClassPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameInnerClass.FrameInnerClassPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 frameInnerClass.kt:14
 Compile bytecode for prop1
diff --git a/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out b/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out
index 174a959a1d7..ea2067f31fd 100644
--- a/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at frameInnerLambda.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! frameInnerLambda.FrameInnerLambdaPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameInnerLambda.FrameInnerLambdaPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 frameInnerLambda.kt:8
 Compile bytecode for val1
diff --git a/idea/testData/debugger/tinyApp/outs/frameLambda.out b/idea/testData/debugger/tinyApp/outs/frameLambda.out
index 166449bda2d..a350934bffb 100644
--- a/idea/testData/debugger/tinyApp/outs/frameLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/frameLambda.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at frameLambda.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! frameLambda.FrameLambdaPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameLambda.FrameLambdaPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 frameLambda.kt:6
 Compile bytecode for val1
diff --git a/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out b/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out
index ea3d5ab1794..92dac611503 100644
--- a/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out
+++ b/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at frameLambdaNotUsed.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! frameLambdaNotUsed.FrameLambdaNotUsedPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameLambdaNotUsed.FrameLambdaNotUsedPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 frameLambdaNotUsed.kt:6
 Compile bytecode for val1
diff --git a/idea/testData/debugger/tinyApp/outs/frameObject.out b/idea/testData/debugger/tinyApp/outs/frameObject.out
index 718510979ef..e0c6fa974d5 100644
--- a/idea/testData/debugger/tinyApp/outs/frameObject.out
+++ b/idea/testData/debugger/tinyApp/outs/frameObject.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at frameObject.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! frameObject.FrameObjectPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameObject.FrameObjectPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 frameObject.kt:5
 Compile bytecode for O.obProp
diff --git a/idea/testData/debugger/tinyApp/outs/frameSharedVar.out b/idea/testData/debugger/tinyApp/outs/frameSharedVar.out
index 7e0ab6dca6e..f9dc0f2cb67 100644
--- a/idea/testData/debugger/tinyApp/outs/frameSharedVar.out
+++ b/idea/testData/debugger/tinyApp/outs/frameSharedVar.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at frameSharedVar.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! frameSharedVar.FrameSharedVarPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameSharedVar.FrameSharedVarPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 frameSharedVar.kt:6
 package frameSharedVar
diff --git a/idea/testData/debugger/tinyApp/outs/frameSimple.out b/idea/testData/debugger/tinyApp/outs/frameSimple.out
index 6fcd027b57b..f1063d0c672 100644
--- a/idea/testData/debugger/tinyApp/outs/frameSimple.out
+++ b/idea/testData/debugger/tinyApp/outs/frameSimple.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at frameSimple.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! frameSimple.FrameSimplePackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameSimple.FrameSimplePackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 frameSimple.kt:8
 Compile bytecode for val1
diff --git a/idea/testData/debugger/tinyApp/outs/frameThis0.out b/idea/testData/debugger/tinyApp/outs/frameThis0.out
index e7e427769e2..9c6a2d62e38 100644
--- a/idea/testData/debugger/tinyApp/outs/frameThis0.out
+++ b/idea/testData/debugger/tinyApp/outs/frameThis0.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at frameThis0.kt:15
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! frameThis0.FrameThis0Package
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameThis0.FrameThis0Package
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 frameThis0.kt:14
 Compile bytecode for val1
diff --git a/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out b/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out
index 0742d4cbd78..ba826f9a3e9 100644
--- a/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out
+++ b/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at frameThis0Ext.kt:14
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! frameThis0Ext.FrameThis0ExtPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameThis0Ext.FrameThis0ExtPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 frameThis0Ext.kt:13
 Compile bytecode for val1
diff --git a/idea/testData/debugger/tinyApp/outs/frameThis0This0.out b/idea/testData/debugger/tinyApp/outs/frameThis0This0.out
index 6418ba9f128..8b0aef3cedf 100644
--- a/idea/testData/debugger/tinyApp/outs/frameThis0This0.out
+++ b/idea/testData/debugger/tinyApp/outs/frameThis0This0.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at frameThis0This0.kt:16
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! frameThis0This0.FrameThis0This0Package
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameThis0This0.FrameThis0This0Package
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 frameThis0This0.kt:15
 Compile bytecode for val1
diff --git a/idea/testData/debugger/tinyApp/outs/imports.out b/idea/testData/debugger/tinyApp/outs/imports.out
index f5d2f0980ef..6dff3868f51 100644
--- a/idea/testData/debugger/tinyApp/outs/imports.out
+++ b/idea/testData/debugger/tinyApp/outs/imports.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at imports.kt:10
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! imports.ImportsPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! imports.ImportsPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 imports.kt:9
 Compile bytecode for Collections.emptyList<String>()
diff --git a/idea/testData/debugger/tinyApp/outs/insertInBlock.out b/idea/testData/debugger/tinyApp/outs/insertInBlock.out
index 88697b9114e..e8ec30b7e27 100644
--- a/idea/testData/debugger/tinyApp/outs/insertInBlock.out
+++ b/idea/testData/debugger/tinyApp/outs/insertInBlock.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at insertInBlock.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! insertInBlock.InsertInBlockPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! insertInBlock.InsertInBlockPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 insertInBlock.kt:5
 Compile bytecode for 1 + 1
diff --git a/idea/testData/debugger/tinyApp/outs/javaFun.out b/idea/testData/debugger/tinyApp/outs/javaFun.out
index edb7f0e2c9e..2f73ea18759 100644
--- a/idea/testData/debugger/tinyApp/outs/javaFun.out
+++ b/idea/testData/debugger/tinyApp/outs/javaFun.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at javaFun.kt:8
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! javaFun.JavaFunPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! javaFun.JavaFunPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 javaFun.kt:7
 MyJavaClass.java:4
diff --git a/idea/testData/debugger/tinyApp/outs/memberFunFromClass.out b/idea/testData/debugger/tinyApp/outs/memberFunFromClass.out
index ae3ab55cafe..d0541164d0b 100644
--- a/idea/testData/debugger/tinyApp/outs/memberFunFromClass.out
+++ b/idea/testData/debugger/tinyApp/outs/memberFunFromClass.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at memberFunFromClass.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! memberFunFromClass.MemberFunFromClassPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! memberFunFromClass.MemberFunFromClassPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 memberFunFromClass.kt:5
 memberFunFromClass.kt:9
diff --git a/idea/testData/debugger/tinyApp/outs/memberFunFromTopLevel.out b/idea/testData/debugger/tinyApp/outs/memberFunFromTopLevel.out
index 4f55a285f35..695902256f5 100644
--- a/idea/testData/debugger/tinyApp/outs/memberFunFromTopLevel.out
+++ b/idea/testData/debugger/tinyApp/outs/memberFunFromTopLevel.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at memberFunFromTopLevel.kt:13
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! memberFunFromTopLevel.MemberFunFromTopLevelPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! memberFunFromTopLevel.MemberFunFromTopLevelPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 memberFunFromTopLevel.kt:12
 memberFunFromTopLevel.kt:4
diff --git a/idea/testData/debugger/tinyApp/outs/memberGetterFromClass.out b/idea/testData/debugger/tinyApp/outs/memberGetterFromClass.out
index 5ef76be5f53..c960bc69cb8 100644
--- a/idea/testData/debugger/tinyApp/outs/memberGetterFromClass.out
+++ b/idea/testData/debugger/tinyApp/outs/memberGetterFromClass.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at memberGetterFromClass.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! memberGetterFromClass.MemberGetterFromClassPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! memberGetterFromClass.MemberGetterFromClassPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 memberGetterFromClass.kt:5
 memberGetterFromClass.kt:10
diff --git a/idea/testData/debugger/tinyApp/outs/memberGetterFromTopLevel.out b/idea/testData/debugger/tinyApp/outs/memberGetterFromTopLevel.out
index 7699e7232f3..d90868d08f4 100644
--- a/idea/testData/debugger/tinyApp/outs/memberGetterFromTopLevel.out
+++ b/idea/testData/debugger/tinyApp/outs/memberGetterFromTopLevel.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at memberGetterFromTopLevel.kt:15
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! memberGetterFromTopLevel.MemberGetterFromTopLevelPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! memberGetterFromTopLevel.MemberGetterFromTopLevelPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 memberGetterFromTopLevel.kt:14
 memberGetterFromTopLevel.kt:5
diff --git a/idea/testData/debugger/tinyApp/outs/multilineExpressionAtBreakpoint.out b/idea/testData/debugger/tinyApp/outs/multilineExpressionAtBreakpoint.out
index 0393ae05b63..ffae2baf184 100644
--- a/idea/testData/debugger/tinyApp/outs/multilineExpressionAtBreakpoint.out
+++ b/idea/testData/debugger/tinyApp/outs/multilineExpressionAtBreakpoint.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at multilineExpressionAtBreakpoint.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! multilineExpressionAtBreakpoint.MultilineExpressionAtBreakpointPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! multilineExpressionAtBreakpoint.MultilineExpressionAtBreakpointPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 multilineExpressionAtBreakpoint.kt:4
 Compile bytecode for 1 + 1
diff --git a/idea/testData/debugger/tinyApp/outs/objectFun.out b/idea/testData/debugger/tinyApp/outs/objectFun.out
index 270f9fbfca0..f884e0c20e8 100644
--- a/idea/testData/debugger/tinyApp/outs/objectFun.out
+++ b/idea/testData/debugger/tinyApp/outs/objectFun.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at objectFun.kt:11
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! objectFun.ObjectFunPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! objectFun.ObjectFunPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 objectFun.kt:10
 objectFun.kt:4
diff --git a/idea/testData/debugger/tinyApp/outs/privateMember.out b/idea/testData/debugger/tinyApp/outs/privateMember.out
index 94b8493961c..7088f737d86 100644
--- a/idea/testData/debugger/tinyApp/outs/privateMember.out
+++ b/idea/testData/debugger/tinyApp/outs/privateMember.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at privateMember.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! privateMember.PrivateMemberPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! privateMember.PrivateMemberPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 privateMember.kt:8
 Compile bytecode for MyClass().privateFun()
diff --git a/idea/testData/debugger/tinyApp/outs/protectedMember.out b/idea/testData/debugger/tinyApp/outs/protectedMember.out
index 35f56ba3f9f..c1cc717108b 100644
--- a/idea/testData/debugger/tinyApp/outs/protectedMember.out
+++ b/idea/testData/debugger/tinyApp/outs/protectedMember.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at protectedMember.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! protectedMember.ProtectedMemberPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! protectedMember.ProtectedMemberPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 protectedMember.kt:4
 Compile bytecode for MyClass().protectedFun()
diff --git a/idea/testData/debugger/tinyApp/outs/simple.out b/idea/testData/debugger/tinyApp/outs/simple.out
index a50f76d0ce6..fa904824dbb 100644
--- a/idea/testData/debugger/tinyApp/outs/simple.out
+++ b/idea/testData/debugger/tinyApp/outs/simple.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at simple.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! simple.SimplePackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! simple.SimplePackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 simple.kt:4
 Compile bytecode for 1
diff --git a/idea/testData/debugger/tinyApp/outs/stdlib.out b/idea/testData/debugger/tinyApp/outs/stdlib.out
index dd798d2101e..4879e377a62 100644
--- a/idea/testData/debugger/tinyApp/outs/stdlib.out
+++ b/idea/testData/debugger/tinyApp/outs/stdlib.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at stdlib.kt:5
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! stdlib.StdlibPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stdlib.StdlibPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 stdlib.kt:4
 Compile bytecode for array(100, 101)
diff --git a/idea/testData/debugger/tinyApp/outs/topLevelFunFromClass.out b/idea/testData/debugger/tinyApp/outs/topLevelFunFromClass.out
index 712fe18e54e..ddf85690523 100644
--- a/idea/testData/debugger/tinyApp/outs/topLevelFunFromClass.out
+++ b/idea/testData/debugger/tinyApp/outs/topLevelFunFromClass.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at topLevelFunFromClass.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! topLevelFunFromClass.TopLevelFunFromClassPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! topLevelFunFromClass.TopLevelFunFromClassPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 topLevelFunFromClass.kt:5
 topLevelFunFromClass.kt:10
diff --git a/idea/testData/debugger/tinyApp/outs/topLevelFunFromTopLevel.out b/idea/testData/debugger/tinyApp/outs/topLevelFunFromTopLevel.out
index 64af9464f43..d2e12658406 100644
--- a/idea/testData/debugger/tinyApp/outs/topLevelFunFromTopLevel.out
+++ b/idea/testData/debugger/tinyApp/outs/topLevelFunFromTopLevel.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at topLevelFunFromTopLevel.kt:9
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! topLevelFunFromTopLevel.TopLevelFunFromTopLevelPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! topLevelFunFromTopLevel.TopLevelFunFromTopLevelPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 topLevelFunFromTopLevel.kt:8
 topLevelFunFromTopLevel.kt:3
diff --git a/idea/testData/debugger/tinyApp/outs/topLevelGetterFromClass.out b/idea/testData/debugger/tinyApp/outs/topLevelGetterFromClass.out
index f2001137d59..e4869eae785 100644
--- a/idea/testData/debugger/tinyApp/outs/topLevelGetterFromClass.out
+++ b/idea/testData/debugger/tinyApp/outs/topLevelGetterFromClass.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at topLevelGetterFromClass.kt:6
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! topLevelGetterFromClass.TopLevelGetterFromClassPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! topLevelGetterFromClass.TopLevelGetterFromClassPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 topLevelGetterFromClass.kt:5
 topLevelGetterFromClass.kt:11
diff --git a/idea/testData/debugger/tinyApp/outs/topLevelGetterFromTopLevel.out b/idea/testData/debugger/tinyApp/outs/topLevelGetterFromTopLevel.out
index 504e3a001bd..ff7e9ebb9dc 100644
--- a/idea/testData/debugger/tinyApp/outs/topLevelGetterFromTopLevel.out
+++ b/idea/testData/debugger/tinyApp/outs/topLevelGetterFromTopLevel.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at topLevelGetterFromTopLevel.kt:11
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! topLevelGetterFromTopLevel.TopLevelGetterFromTopLevelPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! topLevelGetterFromTopLevel.TopLevelGetterFromTopLevelPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 topLevelGetterFromTopLevel.kt:10
 topLevelGetterFromTopLevel.kt:4
diff --git a/idea/testData/debugger/tinyApp/outs/vars.out b/idea/testData/debugger/tinyApp/outs/vars.out
index 0a19db7c231..d7ab9217393 100644
--- a/idea/testData/debugger/tinyApp/outs/vars.out
+++ b/idea/testData/debugger/tinyApp/outs/vars.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at vars.kt:7
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! vars.VarsPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! vars.VarsPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 vars.kt:6
 Compile bytecode for a
diff --git a/idea/testData/debugger/tinyApp/outs/whenEntry.out b/idea/testData/debugger/tinyApp/outs/whenEntry.out
index ce58aa31996..2a61721a34b 100644
--- a/idea/testData/debugger/tinyApp/outs/whenEntry.out
+++ b/idea/testData/debugger/tinyApp/outs/whenEntry.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at whenEntry.kt:10
 LineBreakpoint created at whenEntry.kt:18
 LineBreakpoint created at whenEntry.kt:26
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! whenEntry.WhenEntryPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! whenEntry.WhenEntryPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 whenEntry.kt:9
 Compile bytecode for a
diff --git a/idea/testData/debugger/tinyApp/outs/withoutBodyFunctions.out b/idea/testData/debugger/tinyApp/outs/withoutBodyFunctions.out
index e441b225400..fe868902e2c 100644
--- a/idea/testData/debugger/tinyApp/outs/withoutBodyFunctions.out
+++ b/idea/testData/debugger/tinyApp/outs/withoutBodyFunctions.out
@@ -4,7 +4,7 @@ LineBreakpoint created at withoutBodyFunctions.kt:21
 LineBreakpoint created at withoutBodyFunctions.kt:27
 LineBreakpoint created at withoutBodyFunctions.kt:32
 LineBreakpoint created at withoutBodyFunctions.kt:36
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! withoutBodyFunctions.WithoutBodyFunctionsPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! withoutBodyFunctions.WithoutBodyFunctionsPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 withoutBodyFunctions.kt:8
 Compile bytecode for 1 + 1
diff --git a/idea/testData/debugger/tinyApp/outs/withoutBodyProperties.out b/idea/testData/debugger/tinyApp/outs/withoutBodyProperties.out
index ed220adff2a..2cbc0502450 100644
--- a/idea/testData/debugger/tinyApp/outs/withoutBodyProperties.out
+++ b/idea/testData/debugger/tinyApp/outs/withoutBodyProperties.out
@@ -3,7 +3,7 @@ LineBreakpoint created at withoutBodyProperties.kt:13
 LineBreakpoint created at withoutBodyProperties.kt:18
 LineBreakpoint created at withoutBodyProperties.kt:29
 LineBreakpoint created at withoutBodyProperties.kt:36
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! withoutBodyProperties.WithoutBodyPropertiesPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! withoutBodyProperties.WithoutBodyPropertiesPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 withoutBodyProperties.kt:7
 Compile bytecode for 1 + 1
diff --git a/idea/testData/debugger/tinyApp/outs/withoutBodyTypeParameters.out b/idea/testData/debugger/tinyApp/outs/withoutBodyTypeParameters.out
index 9d9d882b13c..a0f0e020957 100644
--- a/idea/testData/debugger/tinyApp/outs/withoutBodyTypeParameters.out
+++ b/idea/testData/debugger/tinyApp/outs/withoutBodyTypeParameters.out
@@ -1,5 +1,5 @@
 LineBreakpoint created at withoutBodyTypeParameters.kt:8
-!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!RT_JAR! withoutBodyTypeParameters.WithoutBodyTypeParametersPackage
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! withoutBodyTypeParameters.WithoutBodyTypeParametersPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 withoutBodyTypeParameters.kt:7
 Compile bytecode for i
diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java
index 1f5b7abe2a1..48caf69db02 100644
--- a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java
+++ b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java
@@ -26,6 +26,7 @@ import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.roots.ui.configuration.libraryEditor.NewLibraryEditor;
 import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.vfs.VfsUtil;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
 import com.intellij.psi.JavaPsiFacade;
 import com.intellij.psi.PsiClass;
@@ -42,8 +43,10 @@ import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
+import org.jetbrains.jet.plugin.ProjectDescriptorWithStdlibSources;
 import org.jetbrains.jet.plugin.framework.JavaRuntimeLibraryDescription;
 import org.jetbrains.jet.testing.ConfigLibraryUtil;
+import org.jetbrains.jet.utils.PathUtil;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -54,6 +57,11 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase {
     protected static final String TINY_APP = PluginTestCaseBase.getTestDataPathBase() + "/debugger/tinyApp";
     private static boolean IS_TINY_APP_COMPILED = false;
 
+    private static File CUSTOM_LIBRARY_JAR;
+    private final File CUSTOM_LIBRARY_SOURCES = new File(getTestAppPath() + "/customLibrary");
+
+    private final ProjectDescriptorWithStdlibSources projectDescriptor = ProjectDescriptorWithStdlibSources.INSTANCE;
+
     @Override
     protected OutputChecker initOutputChecker() {
         return new KotlinOutputChecker(TINY_APP);
@@ -78,18 +86,30 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase {
                     public void run() {
                         ModifiableRootModel model = ModuleRootManager.getInstance(getModule()).getModifiableModel();
 
-                        NewLibraryEditor editor = new NewLibraryEditor();
-                        editor.setName(JavaRuntimeLibraryDescription.LIBRARY_NAME);
-                        editor.addRoot(VfsUtil.getUrlForLibraryRoot(ForTestCompileRuntime.runtimeJarForTests()), OrderRootType.CLASSES);
+                        projectDescriptor.configureModule(getModule(), model, null);
 
-                        ConfigLibraryUtil.addLibrary(editor, model);
+                        VirtualFile customLibrarySources = VfsUtil.findFileByIoFile(CUSTOM_LIBRARY_SOURCES, false);
+                        assert customLibrarySources != null : "VirtualFile for customLibrary sources should be found";
+                        model.getContentEntries()[0].addExcludeFolder(customLibrarySources);
+
+                        configureCustomLibrary(model);
 
                         model.commit();
                     }
                 });
             }
         });
+    }
 
+    private static void configureCustomLibrary(@NotNull ModifiableRootModel model) {
+        NewLibraryEditor customLibEditor = new NewLibraryEditor();
+        customLibEditor.setName("CustomLibrary");
+
+        String customLibraryRoot = VfsUtil.getUrlForLibraryRoot(CUSTOM_LIBRARY_JAR);
+        customLibEditor.addRoot(customLibraryRoot, OrderRootType.CLASSES);
+        customLibEditor.addRoot(customLibraryRoot + "/src", OrderRootType.SOURCES);
+
+        ConfigLibraryUtil.addLibrary(customLibEditor, model);
     }
 
     @Override
@@ -98,20 +118,22 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase {
         super.tearDown();
     }
 
+    @SuppressWarnings("AssignmentToStaticFieldFromInstanceMethod")
     @Override
     protected void ensureCompiledAppExists() throws Exception {
         if (!IS_TINY_APP_COMPILED) {
             String modulePath = getTestAppPath();
 
+            CUSTOM_LIBRARY_JAR = MockLibraryUtil.compileLibraryToJar(CUSTOM_LIBRARY_SOURCES.getPath(), true);
+
             String outputDir = modulePath + File.separator + "classes";
             String sourcesDir = modulePath + File.separator + "src";
 
-            MockLibraryUtil.compileKotlin(sourcesDir, new File(outputDir));
+            MockLibraryUtil.compileKotlin(sourcesDir, new File(outputDir), CUSTOM_LIBRARY_JAR.getPath());
 
             List<String> options = Arrays.asList("-d", outputDir);
             JetTestUtils.compileJavaFiles(findJavaFiles(new File(sourcesDir)), options);
 
-            //noinspection AssignmentToStaticFieldFromInstanceMethod
             IS_TINY_APP_COMPILED = true;
         }
     }
@@ -142,13 +164,18 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase {
 
         @Override
         protected String replaceAdditionalInOutput(String str) {
-            return super.replaceAdditionalInOutput(str.replace(ForTestCompileRuntime.runtimeJarForTests().getPath(), "!KOTLIN_RUNTIME!"));
+            return super.replaceAdditionalInOutput(
+                    str.replace(ForTestCompileRuntime.runtimeJarForTests().getPath(), "!KOTLIN_RUNTIME!")
+                            .replace(CUSTOM_LIBRARY_JAR.getPath(), "!CUSTOM_LIBRARY!")
+            );
         }
     }
 
     @Override
     protected String getAppClassesPath() {
-        return super.getAppClassesPath() + File.pathSeparator + ForTestCompileRuntime.runtimeJarForTests().getPath();
+        return super.getAppClassesPath() + File.pathSeparator +
+                    ForTestCompileRuntime.runtimeJarForTests().getPath() + File.pathSeparator +
+                    CUSTOM_LIBRARY_JAR.getPath();
     }
 
     @Override