diff --git a/plugins/gradle/java/src/execution/test/runner/GradleTestRunConfigurationProducer.java b/plugins/gradle/java/src/execution/test/runner/GradleTestRunConfigurationProducer.java
index ae82e6a2e102..14b60377a3a5 100644
--- a/plugins/gradle/java/src/execution/test/runner/GradleTestRunConfigurationProducer.java
+++ b/plugins/gradle/java/src/execution/test/runner/GradleTestRunConfigurationProducer.java
@@ -134,14 +134,13 @@ public abstract class GradleTestRunConfigurationProducer extends RunConfiguratio
     if (sourceSetId == null) {
       taskNode = ExternalSystemApiUtil.find(
         moduleNode, ProjectKeys.TASK,
-        node -> (node.getData().isTest() || GradleCommonClassNames.GRADLE_API_TASKS_TESTING_TEST.equals(node.getData().getType())) &&
+        node -> node.getData().isTest() &&
                 StringUtil.equals("test", node.getData().getName()) || StringUtil.equals(taskPrefix + "test", node.getData().getName()));
     }
     else {
       taskNode = ExternalSystemApiUtil.find(
         moduleNode, ProjectKeys.TASK,
-        node -> (node.getData().isTest() || GradleCommonClassNames.GRADLE_API_TASKS_TESTING_TEST.equals(node.getData().getType())) &&
-                StringUtil.startsWith(node.getData().getName(), sourceSetId));
+        node -> node.getData().isTest() && StringUtil.startsWith(node.getData().getName(), sourceSetId));
     }
 
     if (taskNode == null) return ContainerUtil.emptyList();
diff --git a/plugins/gradle/java/src/execution/test/runner/GradleTestsExecutionConsoleManager.java b/plugins/gradle/java/src/execution/test/runner/GradleTestsExecutionConsoleManager.java
index d06218fab501..df6cd0d89221 100644
--- a/plugins/gradle/java/src/execution/test/runner/GradleTestsExecutionConsoleManager.java
+++ b/plugins/gradle/java/src/execution/test/runner/GradleTestsExecutionConsoleManager.java
@@ -53,7 +53,6 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.gradle.action.GradleRerunFailedTestsAction;
 import org.jetbrains.plugins.gradle.execution.filters.ReRunTaskFilter;
 import org.jetbrains.plugins.gradle.service.project.GradleProjectResolverUtil;
-import org.jetbrains.plugins.gradle.service.resolve.GradleCommonClassNames;
 import org.jetbrains.plugins.gradle.util.GradleBundle;
 import org.jetbrains.plugins.gradle.util.GradleConstants;
 
@@ -185,9 +184,8 @@ public class GradleTestsExecutionConsoleManager
         final DataNode<TaskData> taskDataNode = GradleProjectResolverUtil.findTask(
           externalProjectInfo.getExternalProjectStructure(), projectPath, taskToExecute);
         return taskDataNode != null &&
-               (("check".equals(taskDataNode.getData().getName()) && "verification".equals(taskDataNode.getData().getGroup())
-                 || taskDataNode.getData().isTest()
-                 || GradleCommonClassNames.GRADLE_API_TASKS_TESTING_TEST.equals(taskDataNode.getData().getType())));
+               (taskDataNode.getData().isTest() ||
+                "check".equals(taskDataNode.getData().getName()) && "verification".equals(taskDataNode.getData().getGroup()));
       }) != null;
     }
     return false;