diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java
index ef8e59ade68..c77fc72af99 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java
@@ -194,28 +194,28 @@ public class K2JVMCompiler extends CLICompiler<K2JVMCompilerArguments> {
         if (!arguments.noJdk) {
             classpath.addAll(PathUtil.getJdkClassesRoots());
         }
-        if (!arguments.noStdlib) {
-            classpath.add(paths.getRuntimePath());
-        }
         if (arguments.classpath != null) {
             for (String element : Splitter.on(File.pathSeparatorChar).split(arguments.classpath)) {
                 classpath.add(new File(element));
             }
         }
+        if (!arguments.noStdlib) {
+            classpath.add(paths.getRuntimePath());
+        }
         return classpath;
     }
 
     @NotNull
     private static List<File> getAnnotationsPath(@NotNull KotlinPaths paths, @NotNull K2JVMCompilerArguments arguments) {
         List<File> annotationsPath = Lists.newArrayList();
-        if (!arguments.noJdkAnnotations) {
-            annotationsPath.add(paths.getJdkAnnotationsPath());
-        }
         if (arguments.annotations != null) {
             for (String element : Splitter.on(File.pathSeparatorChar).split(arguments.annotations)) {
                 annotationsPath.add(new File(element));
             }
         }
+        if (!arguments.noJdkAnnotations) {
+            annotationsPath.add(paths.getJdkAnnotationsPath());
+        }
         return annotationsPath;
     }
 }