diff --git a/platform/platform-tests/testSrc/com/intellij/execution/GeneralCommandLineTest.java b/platform/platform-tests/testSrc/com/intellij/execution/GeneralCommandLineTest.java
index ab90b03ca9c2..98df38f82c65 100644
--- a/platform/platform-tests/testSrc/com/intellij/execution/GeneralCommandLineTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/execution/GeneralCommandLineTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -79,7 +79,7 @@ public class GeneralCommandLineTest {
     return new GeneralCommandLine(command);
   }
 
-  @Test
+  @Test(timeout = 60000)
   public void printCommandLine() {
     GeneralCommandLine commandLine = createCommandLine();
     commandLine.setExePath("e x e path");
@@ -98,7 +98,7 @@ public class GeneralCommandLineTest {
                  commandLine.getCommandLineString());
   }
 
-  @Test
+  @Test(timeout = 60000)
   public void unicodePath() throws Exception {
     String mark = String.valueOf(new Random().nextInt());
     File script = createTempScript("spaces 'and quotes' and " + UNICODE_RU + "_" + UNICODE_EU + " ",
@@ -124,7 +124,7 @@ public class GeneralCommandLineTest {
     return ExecUtil.createTempExecutableScript(scriptNamePrefix, ".sh", unixScriptContent);
   }
 
-  @Test
+  @Test(timeout = 60000)
   public void unicodeClassPath() throws Exception {
     assumeTrue(UNICODE != null);
 
@@ -139,7 +139,7 @@ public class GeneralCommandLineTest {
     }
   }
 
-  @Test
+  @Test(timeout = 60000)
   public void passingArgumentsToJavaApp() throws Exception {
     String[] args = ArrayUtil.mergeArrays(ARGUMENTS, "&<>()@^|", "\"&<>()@^|\"");
     Pair<GeneralCommandLine, File> command = makeHelperCommand(null, CommandTestHelper.ARG, args);
@@ -147,7 +147,7 @@ public class GeneralCommandLineTest {
     checkParamPassing(output, args);
   }
 
-  @Test
+  @Test(timeout = 60000)
   public void passingArgumentsToJavaAppThroughWinShell() throws Exception {
     assumeTrue(SystemInfo.isWindows);
 
@@ -159,7 +159,7 @@ public class GeneralCommandLineTest {
     checkParamPassing(output, ARGUMENTS);
   }
 
-  @Test
+  @Test(timeout = 60000)
   public void passingArgumentsToJavaAppThroughCmdScriptAndWinShell() throws Exception {
     assumeTrue(SystemInfo.isWindows);
 
@@ -176,7 +176,7 @@ public class GeneralCommandLineTest {
     }
   }
 
-  @Test
+  @Test(timeout = 60000)
   public void unicodeParameters() throws Exception {
     assumeTrue(UNICODE != null);
 
@@ -186,7 +186,7 @@ public class GeneralCommandLineTest {
     checkParamPassing(output, args);
   }
 
-  @Test
+  @Test(timeout = 60000)
   public void winShellCommand() {
     assumeTrue(SystemInfo.isWindows);
 
@@ -195,7 +195,7 @@ public class GeneralCommandLineTest {
     assertEquals('"' + string + '"', echo);
   }
 
-  @Test
+  @Test(timeout = 60000)
   public void winShellScriptQuoting() throws Exception {
     assumeTrue(SystemInfo.isWindows);
 
@@ -216,7 +216,7 @@ public class GeneralCommandLineTest {
     }
   }
 
-  @Test
+  @Test(timeout = 60000)
   public void winShellQuotingWithExtraSwitch() throws Exception {
     assumeTrue(SystemInfo.isWindows);
 
@@ -226,7 +226,7 @@ public class GeneralCommandLineTest {
     assertEquals(StringUtil.wrapWithDoubleQuote(param), output.trim());
   }
 
-  @Test
+  @Test(timeout = 60000)
   public void redirectInput() throws Exception {
     String content = "Line 1\nLine 2";
     File input = FileUtil.createTempFile("input", null);
@@ -246,7 +246,7 @@ public class GeneralCommandLineTest {
     }
   }
 
-  @Test
+  @Test(timeout = 60000)
   public void hackyEnvMap() {
     Map<String, String> env = createCommandLine().getEnvironment();
 
@@ -267,7 +267,7 @@ public class GeneralCommandLineTest {
     catch (AssertionError ignored) { }
   }
 
-  @Test
+  @Test(timeout = 60000)
   public void environmentPassing() throws Exception {
     Map<String, String> testEnv = new HashMap<>();
     testEnv.put("VALUE_1", "some value");
@@ -278,7 +278,7 @@ public class GeneralCommandLineTest {
     checkEnvPassing(command, testEnv, false);
   }
 
-  @Test
+  @Test(timeout = 60000)
   public void unicodeEnvironment() throws Exception {
     assumeTrue("UTF-8".equals(System.getProperty("file.encoding")));
 
@@ -288,7 +288,7 @@ public class GeneralCommandLineTest {
     checkEnvPassing(command, testEnv, false);
   }
 
-  @Test
+  @Test(timeout = 60000)
   public void emptyEnvironmentPassing() throws Exception {
     Map<String, String> env = newHashMap(pair("a", "b"), pair("", "c"));
     Map<String, String> expected = newHashMap(pair("a", "b"));
@@ -396,4 +396,4 @@ public class GeneralCommandLineTest {
       fail("% missed: " + pctMissed + ", missed: " + missed + ", passed: " + lines);
     }
   }
-}
+}
\ No newline at end of file