diff --git a/plugins/junit/src/com/intellij/execution/junit2/ui/actions/JUnitActions.java b/plugins/junit/src/com/intellij/execution/junit2/ui/actions/JUnitActions.java
deleted file mode 100644
index 7f3e01b09a44..000000000000
--- a/plugins/junit/src/com/intellij/execution/junit2/ui/actions/JUnitActions.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2000-2009 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.intellij.execution.junit2.ui.actions;
-
-import com.intellij.execution.junit2.ui.model.JUnitAdapter;
-import com.intellij.execution.junit2.ui.model.JUnitRunningModel;
-import com.intellij.execution.junit2.ui.model.StateEvent;
-import com.intellij.execution.junit2.ui.properties.JUnitConsoleProperties;
-import com.intellij.execution.testframework.AbstractTestProxy;
-import com.intellij.execution.testframework.Filter;
-import com.intellij.execution.testframework.actions.TestFrameworkActions;
-
-public class JUnitActions extends TestFrameworkActions {
-  public static void installAutoscrollToFirstDefect(final JUnitRunningModel model) {
-    model.addListener(new JUnitAdapter() {
-      public void onRunnerStateChanged(final StateEvent event) {
-        if (event.isRunning() || !shouldSelect())
-          return;
-        final AbstractTestProxy firstDefect = Filter.DEFECTIVE_LEAF.detectIn(model.getRoot().getAllTests());
-        if (firstDefect != null) model.selectAndNotify(firstDefect);
-      }
-
-      private boolean shouldSelect() {
-        return JUnitConsoleProperties.SELECT_FIRST_DEFECT.value(model.getProperties());
-      }
-    });
-  }
-}
diff --git a/plugins/junit/src/com/intellij/execution/junit2/ui/actions/JUnitToolbarPanel.java b/plugins/junit/src/com/intellij/execution/junit2/ui/actions/JUnitToolbarPanel.java
index ece862ba4f6e..180deac756bc 100644
--- a/plugins/junit/src/com/intellij/execution/junit2/ui/actions/JUnitToolbarPanel.java
+++ b/plugins/junit/src/com/intellij/execution/junit2/ui/actions/JUnitToolbarPanel.java
@@ -21,11 +21,10 @@ import com.intellij.execution.Location;
 import com.intellij.execution.junit2.TestProxy;
 import com.intellij.execution.junit2.ui.model.JUnitAdapter;
 import com.intellij.execution.junit2.ui.model.JUnitRunningModel;
+import com.intellij.execution.junit2.ui.model.StateEvent;
+import com.intellij.execution.junit2.ui.properties.JUnitConsoleProperties;
 import com.intellij.execution.runners.ExecutionEnvironment;
-import com.intellij.execution.testframework.TestConsoleProperties;
-import com.intellij.execution.testframework.TestFrameworkRunningModel;
-import com.intellij.execution.testframework.TestsUIUtil;
-import com.intellij.execution.testframework.ToolbarPanel;
+import com.intellij.execution.testframework.*;
 import com.intellij.execution.testframework.actions.ScrollToTestSourceAction;
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
@@ -63,7 +62,14 @@ public class JUnitToolbarPanel extends ToolbarPanel {
   public void setModel(final TestFrameworkRunningModel model) {
     super.setModel(model);
     final JUnitRunningModel jUnitModel = (JUnitRunningModel)model;
-    JUnitActions.installAutoscrollToFirstDefect(jUnitModel);
+    jUnitModel.addListener(new JUnitAdapter() {
+      public void onRunnerStateChanged(final StateEvent event) {
+        if (event.isRunning() || !JUnitConsoleProperties.SELECT_FIRST_DEFECT.value(jUnitModel.getProperties()))
+          return;
+        final AbstractTestProxy firstDefect = Filter.DEFECTIVE_LEAF.detectIn(jUnitModel.getRoot().getAllTests());
+        if (firstDefect != null) jUnitModel.selectAndNotify(firstDefect);
+      }
+    });
     RunningTestTracker.install(jUnitModel);
     jUnitModel.addListener(new LvcsLabeler(jUnitModel));
     jUnitModel.addListener(new JUnitAdapter() {