diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml
index b7373f08e6e8..adc185651929 100644
--- a/platform/platform-resources/src/idea/LangActions.xml
+++ b/platform/platform-resources/src/idea/LangActions.xml
@@ -879,7 +879,7 @@
       <add-to-group group-id="TestTreePopupMenu" anchor="last"/>
     </group>
     <group>
-      <action class="com.intellij.execution.testframework.sm.runner.ui.actions.ImportTestsAction"
+      <action class="com.intellij.execution.testframework.sm.runner.history.actions.ImportTestsAction"
               text="Import Test Results" id="ImportTests"/>
       <add-to-group group-id="RunMenu" anchor="after" relative-to-action="editRunConfigurations"/>
     </group>
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMRunnerConsolePropertiesProvider.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMRunnerConsolePropertiesProvider.java
index 6b609c23dfb8..136d9e89e16b 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMRunnerConsolePropertiesProvider.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMRunnerConsolePropertiesProvider.java
@@ -19,7 +19,7 @@ import com.intellij.execution.Executor;
 
 /**
  * If {@link com.intellij.execution.configurations.RunConfiguration} uses SMRunner and implements this interface,
- * {@link com.intellij.execution.testframework.sm.runner.ui.actions.ImportTestsAction} would work from Main Menu.
+ * {@link com.intellij.execution.testframework.sm.runner.history.actions.ImportTestsAction} would work from Main Menu.
  */
 public interface SMRunnerConsolePropertiesProvider {
   SMTRunnerConsoleProperties createTestConsoleProperties(Executor executor);
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleProperties.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleProperties.java
index 368a952938f9..f36059be7b0c 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleProperties.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleProperties.java
@@ -26,7 +26,7 @@ import com.intellij.execution.filters.HyperlinkInfo;
 import com.intellij.execution.testframework.TestConsoleProperties;
 import com.intellij.execution.testframework.actions.AbstractRerunFailedTestsAction;
 import com.intellij.execution.testframework.sm.SMStacktraceParserEx;
-import com.intellij.execution.testframework.sm.runner.ui.actions.ImportTestsAction;
+import com.intellij.execution.testframework.sm.runner.history.actions.ImportTestsAction;
 import com.intellij.execution.ui.ConsoleView;
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.openapi.actionSystem.AnAction;
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/history/ImportedTestConsoleProperties.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/history/ImportedTestConsoleProperties.java
similarity index 97%
rename from platform/smRunner/src/com/intellij/execution/testframework/history/ImportedTestConsoleProperties.java
rename to platform/smRunner/src/com/intellij/execution/testframework/sm/runner/history/ImportedTestConsoleProperties.java
index 5db4bf95e709..0b529b46083d 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/history/ImportedTestConsoleProperties.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/history/ImportedTestConsoleProperties.java
@@ -13,11 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.execution.testframework.history;
+package com.intellij.execution.testframework.sm.runner.history;
 
 import com.intellij.execution.Executor;
 import com.intellij.execution.Location;
-import com.intellij.execution.configurations.RunConfiguration;
 import com.intellij.execution.configurations.RunProfile;
 import com.intellij.execution.filters.Filter;
 import com.intellij.execution.process.ProcessHandler;
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/history/ImportedTestContentHandler.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/history/ImportedTestContentHandler.java
similarity index 98%
rename from platform/smRunner/src/com/intellij/execution/testframework/history/ImportedTestContentHandler.java
rename to platform/smRunner/src/com/intellij/execution/testframework/sm/runner/history/ImportedTestContentHandler.java
index ce087da764be..0b7952da402d 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/history/ImportedTestContentHandler.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/history/ImportedTestContentHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.execution.testframework.history;
+package com.intellij.execution.testframework.sm.runner.history;
 
 import com.intellij.execution.process.ProcessOutputTypes;
 import com.intellij.execution.testframework.export.TestResultsXmlFormatter;
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/history/ImportedTestRunnableState.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/history/ImportedTestRunnableState.java
similarity index 95%
rename from platform/smRunner/src/com/intellij/execution/testframework/history/ImportedTestRunnableState.java
rename to platform/smRunner/src/com/intellij/execution/testframework/sm/runner/history/ImportedTestRunnableState.java
index 495061449946..53602ce97159 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/history/ImportedTestRunnableState.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/history/ImportedTestRunnableState.java
@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.execution.testframework.history;
+package com.intellij.execution.testframework.sm.runner.history;
 
 import com.intellij.execution.DefaultExecutionResult;
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.ExecutionResult;
 import com.intellij.execution.Executor;
-import com.intellij.execution.configurations.RunConfiguration;
 import com.intellij.execution.configurations.RunProfile;
 import com.intellij.execution.configurations.RunProfileState;
 import com.intellij.execution.process.ProcessHandler;
@@ -28,7 +27,7 @@ import com.intellij.execution.testframework.TestFrameworkRunningModel;
 import com.intellij.execution.testframework.actions.AbstractRerunFailedTestsAction;
 import com.intellij.execution.testframework.sm.SMTestRunnerConnectionUtil;
 import com.intellij.execution.testframework.sm.runner.SMTRunnerConsoleProperties;
-import com.intellij.execution.testframework.sm.runner.ui.actions.ImportTestsAction;
+import com.intellij.execution.testframework.sm.runner.history.actions.ImportTestsAction;
 import com.intellij.execution.testframework.ui.BaseTestsOutputConsoleView;
 import com.intellij.openapi.util.Getter;
 import org.jetbrains.annotations.NotNull;
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/history/ImportedToGeneralTestEventsConverter.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/history/ImportedToGeneralTestEventsConverter.java
similarity index 98%
rename from platform/smRunner/src/com/intellij/execution/testframework/history/ImportedToGeneralTestEventsConverter.java
rename to platform/smRunner/src/com/intellij/execution/testframework/sm/runner/history/ImportedToGeneralTestEventsConverter.java
index f14ee8b30ecb..2c21befffb18 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/history/ImportedToGeneralTestEventsConverter.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/history/ImportedToGeneralTestEventsConverter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.execution.testframework.history;
+package com.intellij.execution.testframework.sm.runner.history;
 
 import com.intellij.execution.process.ProcessHandler;
 import com.intellij.execution.testframework.TestConsoleProperties;
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/actions/ImportTestsAction.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/history/actions/ImportTestsAction.java
similarity index 97%
rename from platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/actions/ImportTestsAction.java
rename to platform/smRunner/src/com/intellij/execution/testframework/sm/runner/history/actions/ImportTestsAction.java
index 7b2758135c4c..1aeb1f8e24fe 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/actions/ImportTestsAction.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/history/actions/ImportTestsAction.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.execution.testframework.sm.runner.ui.actions;
+package com.intellij.execution.testframework.sm.runner.history.actions;
 
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.Executor;
@@ -26,7 +26,7 @@ import com.intellij.execution.impl.RunManagerImpl;
 import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.runners.ExecutionEnvironmentBuilder;
-import com.intellij.execution.testframework.history.ImportedTestRunnableState;
+import com.intellij.execution.testframework.sm.runner.history.ImportedTestRunnableState;
 import com.intellij.execution.testframework.sm.runner.SMRunnerConsolePropertiesProvider;
 import com.intellij.execution.testframework.sm.runner.SMTRunnerConsoleProperties;
 import com.intellij.icons.AllIcons;
diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertorTest.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertorTest.java
index 70a92f2b4792..41f4b4b02665 100644
--- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertorTest.java
+++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertorTest.java
@@ -18,7 +18,7 @@ package com.intellij.execution.testframework.sm.runner;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.testframework.AbstractTestProxy;
 import com.intellij.execution.testframework.TestConsoleProperties;
-import com.intellij.execution.testframework.history.ImportedToGeneralTestEventsConverter;
+import com.intellij.execution.testframework.sm.runner.history.ImportedToGeneralTestEventsConverter;
 import com.intellij.execution.testframework.sm.Marker;
 import com.intellij.execution.testframework.sm.runner.events.*;
 import com.intellij.execution.testframework.sm.runner.ui.MockPrinter;
@@ -33,8 +33,6 @@ import org.jetbrains.annotations.Nullable;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreeModel;
-import java.io.InputStreamReader;
-import java.io.StringBufferInputStream;
 import java.io.StringReader;
 import java.util.List;
 import java.util.Set;