diff --git a/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/pom.xml b/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/pom.xml
index 9494ecfe157..c6b554dee23 100644
--- a/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/pom.xml
+++ b/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/pom.xml
@@ -26,12 +26,6 @@
             <artifactId>flow-html-components</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-text-field-flow</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
             <artifactId>flow-test-generic</artifactId>
diff --git a/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/test/java/com/vaadin/flow/component/orderedlayout/tests/ScrollerTest.java b/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/test/java/com/vaadin/flow/component/orderedlayout/tests/ScrollerTest.java
index 938a74bcce0..fb78e510e55 100644
--- a/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/test/java/com/vaadin/flow/component/orderedlayout/tests/ScrollerTest.java
+++ b/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/test/java/com/vaadin/flow/component/orderedlayout/tests/ScrollerTest.java
@@ -19,11 +19,12 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import com.vaadin.flow.component.Focusable;
 import com.vaadin.flow.component.html.Div;
+import com.vaadin.flow.component.html.Input;
 import com.vaadin.flow.component.orderedlayout.Scroller;
 import com.vaadin.flow.component.orderedlayout.Scroller.ScrollDirection;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
-import com.vaadin.flow.component.textfield.TextField;
 
 public class ScrollerTest {
 
@@ -86,14 +87,20 @@ public void setNullScrollDirection_NullPointerExceptionIsThrown() {
         scroller.setScrollDirection(null);
     }
 
+    @Test
+    public void implementsFocusable() {
+        Assert.assertTrue("Scroller should be focusable",
+                Focusable.class.isAssignableFrom(scroller.getClass()));
+    }
+
     @Test
     public void setEnabled_disableChildren() {
-        TextField textField = new TextField();
+        Input input = new Input();
 
-        scroller.setContent(new VerticalLayout(textField));
-        Assert.assertTrue(textField.isEnabled());
+        scroller.setContent(new VerticalLayout(input));
+        Assert.assertTrue(input.isEnabled());
 
         scroller.setEnabled(false);
-        Assert.assertFalse(textField.isEnabled());
+        Assert.assertFalse(input.isEnabled());
     }
 }