diff --git a/teavm-cli/src/main/java/org/teavm/cli/TeaVMRunner.java b/teavm-cli/src/main/java/org/teavm/cli/TeaVMRunner.java
index cbcfd9c7d..be4ddbf0a 100644
--- a/teavm-cli/src/main/java/org/teavm/cli/TeaVMRunner.java
+++ b/teavm-cli/src/main/java/org/teavm/cli/TeaVMRunner.java
@@ -45,17 +45,20 @@ public class TeaVMRunner {
                 .withLongOpt("minify")
                 .create("m"));
         options.addOption(OptionBuilder
+                .withArgName("separate|merge|none")
                 .hasArg()
                 .withDescription("how to attach runtime. Possible values are: separate|merge|none")
                 .withLongOpt("runtime")
                 .create("r"));
         options.addOption(OptionBuilder
                 .withDescription("causes TeaVM to include default main page")
-                .create("mainpage"));
+                .withLongOpt("mainpage")
+                .create());
         options.addOption(OptionBuilder
                 .withDescription("causes TeaVM to log bytecode")
                 .create("logbytecode"));
         options.addOption(OptionBuilder
+                .withArgName("number")
                 .hasArg()
                 .withDescription("how many threads should TeaVM run")
                 .withLongOpt("threads")
@@ -125,6 +128,7 @@ public class TeaVMRunner {
             tool.setMainClass(args[0]);
         }
         tool.setLog(new ConsoleTeaVMToolLog());
+        tool.getProperties().putAll(System.getProperties());
 
         try {
             tool.generate();
@@ -136,7 +140,7 @@ public class TeaVMRunner {
 
     private static void printUsage(Options options) {
         HelpFormatter formatter = new HelpFormatter();
-        formatter.printHelp("java " + TeaVMRunner.class.getName() + "[OPTIONS] [qualified.main.Class]", options);
+        formatter.printHelp("java " + TeaVMRunner.class.getName() + " [OPTIONS] [qualified.main.Class]", options);
         System.exit(-1);
     }
 }
diff --git a/teavm-cli/src/main/java/org/teavm/cli/TeaVMTestRunner.java b/teavm-cli/src/main/java/org/teavm/cli/TeaVMTestRunner.java
new file mode 100644
index 000000000..988d18858
--- /dev/null
+++ b/teavm-cli/src/main/java/org/teavm/cli/TeaVMTestRunner.java
@@ -0,0 +1,183 @@
+package org.teavm.cli;
+
+import java.io.File;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+import org.apache.commons.cli.*;
+import org.teavm.model.ClassHolderTransformer;
+import org.teavm.testing.TestAdapter;
+import org.teavm.tooling.TeaVMTestTool;
+import org.teavm.tooling.TeaVMToolException;
+
+/**
+ *
+ * @author Alexey Andreev
+ */
+public class TeaVMTestRunner {
+    @SuppressWarnings("static-access")
+    public static void main(String[] args) {
+        Options options = new Options();
+        options.addOption(OptionBuilder
+                .withArgName("directory")
+                .hasArg()
+                .withDescription("a directory where to put generated files (current directory by default)")
+                .withLongOpt("targetdir")
+                .create('d'));
+        options.addOption(OptionBuilder
+                .withDescription("causes TeaVM to generate minimized JavaScript file")
+                .withLongOpt("minify")
+                .create("m"));
+        options.addOption(OptionBuilder
+                .withArgName("number")
+                .hasArg()
+                .withDescription("how many threads should TeaVM run")
+                .withLongOpt("threads")
+                .create("t"));
+        options.addOption(OptionBuilder
+                .withArgName("class name")
+                .hasArg()
+                .withDescription("qualified class name of test adapter")
+                .withLongOpt("adapter")
+                .create("a"));
+        options.addOption(OptionBuilder
+                .hasArg()
+                .hasOptionalArgs()
+                .withArgName("class name")
+                .withDescription("qualified class names of transformers")
+                .withLongOpt("transformers")
+                .create("T"));
+
+        if (args.length == 0) {
+            printUsage(options);
+            return;
+        }
+        CommandLineParser parser = new PosixParser();
+        CommandLine commandLine;
+        try {
+            commandLine = parser.parse(options, args);
+        } catch (ParseException e) {
+            printUsage(options);
+            return;
+        }
+
+        TeaVMTestTool tool = new TeaVMTestTool();
+        tool.setOutputDir(new File(commandLine.getOptionValue("d", ".")));
+        tool.setMinifying(commandLine.hasOption("m"));
+        try {
+            tool.setNumThreads(Integer.parseInt(commandLine.getOptionValue("t", "1")));
+        } catch (NumberFormatException e) {
+            System.err.println("Invalid number specified for -t option");
+            printUsage(options);
+            return;
+        }
+        if (commandLine.hasOption("a")) {
+            tool.setAdapter(instantiateAdapter(commandLine.getOptionValue("a")));
+        }
+        if (commandLine.hasOption("T")) {
+            for (String transformerType : commandLine.getOptionValues("T")) {
+                tool.getTransformers().add(instantiateTransformer(transformerType));
+            }
+        }
+        args = commandLine.getArgs();
+        if (args.length == 0) {
+            System.err.println("You did not specify any test classes");
+            printUsage(options);
+            return;
+        }
+        tool.getTestClasses().addAll(Arrays.asList(args));
+
+        tool.setLog(new ConsoleTeaVMToolLog());
+        tool.getProperties().putAll(System.getProperties());
+        long start = System.currentTimeMillis();
+        try {
+            tool.generate();
+        } catch (TeaVMToolException e) {
+            e.printStackTrace(System.err);
+            System.exit(-2);
+        }
+        System.out.println("Operation took " + (System.currentTimeMillis() - start) + " milliseconds");
+    }
+
+    private static TestAdapter instantiateAdapter(String adapterName) {
+        Class<?> adapterClass;
+        try {
+            adapterClass = Class.forName(adapterName, true, TeaVMTestRunner.class.getClassLoader());
+        } catch (ClassNotFoundException e) {
+            System.err.println("Adapter not found: " + adapterName);
+            System.exit(-1);
+            return null;
+        }
+        if (!TestAdapter.class.isAssignableFrom(adapterClass)) {
+            System.err.println("Adapter class does not implement TestAdapter: " + adapterName);
+            System.exit(-1);
+            return null;
+        }
+        Constructor<?> cons;
+        try {
+            cons = adapterClass.getConstructor();
+        } catch (NoSuchMethodException e) {
+            System.err.println("Adapter class does not contain no-arg constructor: " + adapterName);
+            System.exit(-1);
+            return null;
+        }
+
+        try {
+            return (TestAdapter)cons.newInstance();
+        } catch (IllegalAccessException | InstantiationException e) {
+            System.err.println("Error instantiating adapter: " + adapterName);
+            e.printStackTrace(System.err);
+            System.exit(-1);
+            return null;
+        } catch (InvocationTargetException e) {
+            System.err.println("Error instantiating adapter: " + adapterName);
+            e.getTargetException().printStackTrace(System.err);
+            System.exit(-1);
+            return null;
+        }
+    }
+
+    private static ClassHolderTransformer instantiateTransformer(String transformerName) {
+        Class<?> adapterClass;
+        try {
+            adapterClass = Class.forName(transformerName, true, TeaVMTestRunner.class.getClassLoader());
+        } catch (ClassNotFoundException e) {
+            System.err.println("Transformer not found: " + transformerName);
+            System.exit(-1);
+            return null;
+        }
+        if (!ClassHolderTransformer.class.isAssignableFrom(adapterClass)) {
+            System.err.println("Transformer class does not implement ClassHolderTransformer: " + transformerName);
+            System.exit(-1);
+            return null;
+        }
+        Constructor<?> cons;
+        try {
+            cons = adapterClass.getConstructor();
+        } catch (NoSuchMethodException e) {
+            System.err.println("Transformer class does not contain no-arg constructor: " + transformerName);
+            System.exit(-1);
+            return null;
+        }
+
+        try {
+            return (ClassHolderTransformer)cons.newInstance();
+        } catch (IllegalAccessException | InstantiationException e) {
+            System.err.println("Error instantiating transformer: " + transformerName);
+            e.printStackTrace(System.err);
+            System.exit(-1);
+            return null;
+        } catch (InvocationTargetException e) {
+            System.err.println("Error instantiating transformer: " + transformerName);
+            e.getTargetException().printStackTrace(System.err);
+            System.exit(-1);
+            return null;
+        }
+    }
+
+    private static void printUsage(Options options) {
+        HelpFormatter formatter = new HelpFormatter();
+        formatter.printHelp("java " + TeaVMTestRunner.class.getName() + " [OPTIONS] test_name {test_name}", options);
+        System.exit(-1);
+    }
+}