diff --git a/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Main.kt b/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Main.kt
index fa227a1ce50..bea46a4c810 100644
--- a/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Main.kt
+++ b/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Main.kt
@@ -37,6 +37,7 @@ object Main {
         var runner: Runner? = null
         var collectingArguments = false
         val arguments = arrayListOf<String>()
+        var noReflect = false
 
         classpath.add(".")
 
@@ -69,6 +70,9 @@ object Main {
                 runner = ExpressionRunner(next())
                 collectingArguments = true
             }
+            else if ("-no-reflect" == arg) {
+                noReflect = true
+            }
             else if (arg.startsWith("-")) {
                 throw RunnerException("unsupported argument: $arg")
             }
@@ -89,8 +93,9 @@ object Main {
 
         classpath.add(KOTLIN_HOME.toString() + "/lib/kotlin-runtime.jar")
 
-        // TODO: provide a way to disable including kotlin-reflect.jar to the classpath
-        classpath.add(KOTLIN_HOME.toString() + "/lib/kotlin-reflect.jar")
+        if (!noReflect) {
+            classpath.add(KOTLIN_HOME.toString() + "/lib/kotlin-reflect.jar")
+        }
 
         if (runner == null) {
             runner = ReplRunner()
@@ -99,7 +104,8 @@ object Main {
         runner.run(classpath, arguments)
     }
 
-    @JvmStatic fun main(args: Array<String>) {
+    @JvmStatic
+    fun main(args: Array<String>) {
         try {
             run(args)
         }
@@ -124,6 +130,7 @@ where command may be one of:
   -classpath (-cp) <path>    Paths where to find user class files
   -Dname=value               Set a system JVM property
   -J<option>                 Pass an option directly to JVM
+  -no-reflect                Don't include Kotlin reflection implementation into classpath
   -version                   Display Kotlin version
   -help (-h)                 Print a synopsis of options
 """)
diff --git a/compiler/testData/launcher/reflectionUsage.kt b/compiler/testData/launcher/reflectionUsage.kt
new file mode 100644
index 00000000000..3e0e0c26f35
--- /dev/null
+++ b/compiler/testData/launcher/reflectionUsage.kt
@@ -0,0 +1,11 @@
+class Foo(val bar: String?)
+
+fun main(args: Array<String>) {
+    try {
+        if (Foo::bar.returnType.isMarkedNullable) {
+            print("Foo#bar is nullable")
+        }
+    } catch (e: KotlinReflectionNotSupportedError) {
+        print("no reflection")
+    }
+}
diff --git a/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt b/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt
index eb5535ab129..5871e3c1c95 100644
--- a/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt
@@ -47,7 +47,7 @@ class LauncherScriptTest : TestCaseWithTmpdir() {
             assertEquals(expectedStderr, stderr)
             assertEquals(expectedExitCode.code, exitCode)
         }
-        catch (e: Exception) {
+        catch (e: Throwable) {
             System.err.println("exit code $exitCode")
             System.err.println("<stdout>$stdout</stdout>")
             System.err.println("<stderr>$stderr</stderr>")
@@ -82,4 +82,20 @@ class LauncherScriptTest : TestCaseWithTmpdir() {
                 "-output", File(tmpdir, "out.js").path
         )
     }
+
+    fun testKotlinNoReflect() {
+        runProcess(
+                "kotlinc",
+                "$testDataDirectory/reflectionUsage.kt",
+                "-d", tmpdir.path
+        )
+
+        runProcess(
+                "kotlin",
+                "-cp", tmpdir.path,
+                "-no-reflect",
+                "ReflectionUsageKt",
+                expectedStdout = "no reflection"
+        )
+    }
 }