diff --git a/platform/testRunner/src/com/intellij/execution/testframework/TestTreeView.java b/platform/testRunner/src/com/intellij/execution/testframework/TestTreeView.java
index 6df1834aa748..43786d60241d 100644
--- a/platform/testRunner/src/com/intellij/execution/testframework/TestTreeView.java
+++ b/platform/testRunner/src/com/intellij/execution/testframework/TestTreeView.java
@@ -193,7 +193,7 @@ public abstract class TestTreeView extends Tree implements DataProvider, CopyPro
       Rectangle clip = g.getClipBounds();
       final int visibleRowCount = TreeUtil.getVisibleRowCountForFixedRowHeight(this);
       final int firstRow = getClosestRowForLocation(0, visibleRect.y);
-      for (int row = firstRow; row < Math.min(firstRow + visibleRowCount, getRowCount()); row++) {
+      for (int row = firstRow; row < Math.min(firstRow + visibleRowCount + 1, getRowCount()); row++) {
         if (isExpandableHandlerVisibleForCurrentRow(row)) {
           continue;
         }