diff --git a/vaadin-testbench-unit-junit5/src/main/java/com/vaadin/testbench/unit/SpringUIUnitTest.java b/vaadin-testbench-unit-junit5/src/main/java/com/vaadin/testbench/unit/SpringUIUnitTest.java
index 78da0f62a..5dce99a0c 100644
--- a/vaadin-testbench-unit-junit5/src/main/java/com/vaadin/testbench/unit/SpringUIUnitTest.java
+++ b/vaadin-testbench-unit-junit5/src/main/java/com/vaadin/testbench/unit/SpringUIUnitTest.java
@@ -52,9 +52,15 @@
  * }
  * }
  * </pre>
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @ExtendWith({ SpringExtension.class })
 @TestExecutionListeners(listeners = UITestSpringLookupInitializer.class, mergeMode = TestExecutionListeners.MergeMode.MERGE_WITH_DEFAULTS)
+@Deprecated(forRemoval = true, since = "10.1")
 public abstract class SpringUIUnitTest extends UIUnitTest {
 
     @Autowired
diff --git a/vaadin-testbench-unit-junit5/src/main/java/com/vaadin/testbench/unit/TreeOnFailureExtension.java b/vaadin-testbench-unit-junit5/src/main/java/com/vaadin/testbench/unit/TreeOnFailureExtension.java
index 51d87b770..79ffdd6c2 100644
--- a/vaadin-testbench-unit-junit5/src/main/java/com/vaadin/testbench/unit/TreeOnFailureExtension.java
+++ b/vaadin-testbench-unit-junit5/src/main/java/com/vaadin/testbench/unit/TreeOnFailureExtension.java
@@ -20,7 +20,13 @@
  * <p>
  * This can help with identifying a problem that has happened in the test where
  * a component is missing or has faulty data.
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
+@Deprecated(forRemoval = true, since = "10.1")
 public class TreeOnFailureExtension implements AfterTestExecutionCallback {
 
     @Override
diff --git a/vaadin-testbench-unit-junit5/src/main/java/com/vaadin/testbench/unit/UIUnitTest.java b/vaadin-testbench-unit-junit5/src/main/java/com/vaadin/testbench/unit/UIUnitTest.java
index a5f311cfb..40cf33cc7 100644
--- a/vaadin-testbench-unit-junit5/src/main/java/com/vaadin/testbench/unit/UIUnitTest.java
+++ b/vaadin-testbench-unit-junit5/src/main/java/com/vaadin/testbench/unit/UIUnitTest.java
@@ -69,7 +69,13 @@
  * class.
  *
  * @see ViewPackages
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
+@Deprecated(forRemoval = true, since = "10.1")
 public abstract class UIUnitTest extends BaseUIUnitTest
         implements TesterWrappers {
 
diff --git a/vaadin-testbench-unit-quarkus/src/main/java/com/vaadin/testbench/unit/quarkus/QuarkusSecurityCustomizer.java b/vaadin-testbench-unit-quarkus/src/main/java/com/vaadin/testbench/unit/quarkus/QuarkusSecurityCustomizer.java
index 353a114d3..5cd638e28 100644
--- a/vaadin-testbench-unit-quarkus/src/main/java/com/vaadin/testbench/unit/quarkus/QuarkusSecurityCustomizer.java
+++ b/vaadin-testbench-unit-quarkus/src/main/java/com/vaadin/testbench/unit/quarkus/QuarkusSecurityCustomizer.java
@@ -18,7 +18,13 @@
  * Configures mock request with authentication details from Quarkus Security.
  *
  * For internal use only.
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
+@Deprecated(forRemoval = true, since = "10.1")
 public class QuarkusSecurityCustomizer implements MockRequestCustomizer {
 
     @Override
diff --git a/vaadin-testbench-unit-quarkus/src/main/java/com/vaadin/testbench/unit/quarkus/QuarkusTestLookupInitializer.java b/vaadin-testbench-unit-quarkus/src/main/java/com/vaadin/testbench/unit/quarkus/QuarkusTestLookupInitializer.java
index 39e372e49..bf0f9fc39 100644
--- a/vaadin-testbench-unit-quarkus/src/main/java/com/vaadin/testbench/unit/quarkus/QuarkusTestLookupInitializer.java
+++ b/vaadin-testbench-unit-quarkus/src/main/java/com/vaadin/testbench/unit/quarkus/QuarkusTestLookupInitializer.java
@@ -25,7 +25,13 @@
  * Currently, provides integration with Quarkus security.
  *
  * For internal use only.
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
+@Deprecated(forRemoval = true, since = "10.1")
 public class QuarkusTestLookupInitializer extends LookupInitializer {
 
     @Override
diff --git a/vaadin-testbench-unit-quarkus/src/main/java/com/vaadin/testbench/unit/quarkus/QuarkusUIUnitTest.java b/vaadin-testbench-unit-quarkus/src/main/java/com/vaadin/testbench/unit/quarkus/QuarkusUIUnitTest.java
index dde2cb398..2bdfe7c9a 100644
--- a/vaadin-testbench-unit-quarkus/src/main/java/com/vaadin/testbench/unit/quarkus/QuarkusUIUnitTest.java
+++ b/vaadin-testbench-unit-quarkus/src/main/java/com/vaadin/testbench/unit/quarkus/QuarkusUIUnitTest.java
@@ -60,8 +60,14 @@
  * may still be removed by the CDI container because considered unused or not
  * found because of missing bean defining annotations. For the above reasons,
  * currently, using {@code @QuarkusComponentTest} is not recommended.
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 
+@Deprecated(forRemoval = true, since = "10.1")
 public abstract class QuarkusUIUnitTest extends UIUnitTest {
 
     @BeforeEach
diff --git a/vaadin-testbench-unit-quarkus/src/main/java/com/vaadin/testbench/unit/quarkus/mocks/MockQuarkusServlet.java b/vaadin-testbench-unit-quarkus/src/main/java/com/vaadin/testbench/unit/quarkus/mocks/MockQuarkusServlet.java
index a671b3f85..79b4a3f52 100644
--- a/vaadin-testbench-unit-quarkus/src/main/java/com/vaadin/testbench/unit/quarkus/mocks/MockQuarkusServlet.java
+++ b/vaadin-testbench-unit-quarkus/src/main/java/com/vaadin/testbench/unit/quarkus/mocks/MockQuarkusServlet.java
@@ -28,7 +28,13 @@
  * Makes sure that the {@link #routes} are properly registered, and that
  * {@link MockQuarkusServletService} is used instead of vanilla
  * {@link com.vaadin.quarkus.QuarkusVaadinServletService}.
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
+@Deprecated(forRemoval = true, since = "10.1")
 public class MockQuarkusServlet extends QuarkusVaadinServlet {
 
     /**
diff --git a/vaadin-testbench-unit-quarkus/src/main/java/com/vaadin/testbench/unit/quarkus/mocks/MockQuarkusServletService.java b/vaadin-testbench-unit-quarkus/src/main/java/com/vaadin/testbench/unit/quarkus/mocks/MockQuarkusServletService.java
index c9148d72a..2a331ba8d 100644
--- a/vaadin-testbench-unit-quarkus/src/main/java/com/vaadin/testbench/unit/quarkus/mocks/MockQuarkusServletService.java
+++ b/vaadin-testbench-unit-quarkus/src/main/java/com/vaadin/testbench/unit/quarkus/mocks/MockQuarkusServletService.java
@@ -31,7 +31,13 @@
  * {@link com.vaadin.flow.server.VaadinSession}.</li>
  * </ul>
  * The class is intentionally opened, to be extensible in user's library.
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
+@Deprecated(forRemoval = true, since = "10.1")
 public class MockQuarkusServletService extends QuarkusVaadinServletService {
 
     private final transient UIFactory uiFactory;
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/accordion/AccordionTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/accordion/AccordionTester.java
index 819e08e52..c73ff8a3c 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/accordion/AccordionTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/accordion/AccordionTester.java
@@ -14,6 +14,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(Accordion.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class AccordionTester<T extends Accordion> extends ComponentTester<T> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/button/ButtonTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/button/ButtonTester.java
index aeea7d53f..7139fcdeb 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/button/ButtonTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/button/ButtonTester.java
@@ -17,8 +17,14 @@
  *
  * @param <T>
  *            component type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(Button.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class ButtonTester<T extends Button> extends ComponentTester<T> {
     /**
      * Wrap given button for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/charts/ChartTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/charts/ChartTester.java
index ed355db55..ee8f0ce8f 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/charts/ChartTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/charts/ChartTester.java
@@ -34,8 +34,14 @@
  *
  * @param <T>
  *            component type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(Chart.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class ChartTester<T extends Chart> extends ComponentTester<T> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/checkbox/CheckboxGroupTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/checkbox/CheckboxGroupTester.java
index 83f836813..ed802edca 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/checkbox/CheckboxGroupTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/checkbox/CheckboxGroupTester.java
@@ -30,8 +30,14 @@
  *
  * @param <T>
  *            component type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(fqn = "com.vaadin.flow.component.checkbox.CheckboxGroup")
+@Deprecated(forRemoval = true, since = "10.1")
 public class CheckboxGroupTester<T extends CheckboxGroup<V>, V>
         extends ComponentTester<T> {
 
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/checkbox/CheckboxTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/checkbox/CheckboxTester.java
index ec6ff4f5f..252fdc919 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/checkbox/CheckboxTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/checkbox/CheckboxTester.java
@@ -19,8 +19,14 @@
  *
  * @param <T>
  *            component type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(Checkbox.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class CheckboxTester<T extends Checkbox> extends ComponentTester<T> {
 
     /**
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/combobox/ComboBoxTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/combobox/ComboBoxTester.java
index 68204daaa..b50d915f1 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/combobox/ComboBoxTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/combobox/ComboBoxTester.java
@@ -23,6 +23,7 @@
 import com.vaadin.testbench.unit.internal.BasicUtilsKt;
 
 @Tests(fqn = "com.vaadin.flow.component.combobox.ComboBox")
+@Deprecated(forRemoval = true, since = "10.1")
 public class ComboBoxTester<T extends ComboBox<Y>, Y>
         extends ComponentTester<T> {
     /**
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/combobox/MultiSelectComboBoxTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/combobox/MultiSelectComboBoxTester.java
index ad9c537d6..08aab5e0d 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/combobox/MultiSelectComboBoxTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/combobox/MultiSelectComboBoxTester.java
@@ -25,6 +25,7 @@
 import com.vaadin.testbench.unit.internal.BasicUtilsKt;
 
 @Tests(fqn = "com.vaadin.flow.component.combobox.MultiSelectComboBox")
+@Deprecated(forRemoval = true, since = "10.1")
 public class MultiSelectComboBoxTester<T extends MultiSelectComboBox<Y>, Y>
         extends ComponentTester<T> {
     /**
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/confirmdialog/ConfirmDialogTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/confirmdialog/ConfirmDialogTester.java
index a3f337d55..4e99342ad 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/confirmdialog/ConfirmDialogTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/confirmdialog/ConfirmDialogTester.java
@@ -17,8 +17,14 @@
 
 /**
  * Tester for ConfirmDialog.
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(ConfirmDialog.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class ConfirmDialogTester extends ComponentTester<ConfirmDialog> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/contextmenu/ContextMenuTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/contextmenu/ContextMenuTester.java
index 86922c0ce..611c9ab65 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/contextmenu/ContextMenuTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/contextmenu/ContextMenuTester.java
@@ -28,8 +28,14 @@
  *
  * @param <T>
  *            component type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(ContextMenu.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class ContextMenuTester<T extends ContextMenu>
         extends ComponentTester<T> {
 
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/datepicker/DatePickerTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/datepicker/DatePickerTester.java
index 9a2ddc855..1d90af734 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/datepicker/DatePickerTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/datepicker/DatePickerTester.java
@@ -20,8 +20,14 @@
  *
  * @param <T>
  *            component type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(DatePicker.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class DatePickerTester<T extends DatePicker> extends ComponentTester<T> {
 
     /**
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/datetimepicker/DateTimePickerTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/datetimepicker/DateTimePickerTester.java
index b5c4e4b67..1d3de2611 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/datetimepicker/DateTimePickerTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/datetimepicker/DateTimePickerTester.java
@@ -21,8 +21,14 @@
  *
  * @param <T>
  *            component type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(DateTimePicker.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class DateTimePickerTester<T extends DateTimePicker>
         extends ComponentTester<T> {
     /**
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/details/DetailsTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/details/DetailsTester.java
index 67697daa3..0e4c63c24 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/details/DetailsTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/details/DetailsTester.java
@@ -16,8 +16,14 @@
  *
  * @param <T>
  *            component type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(Details.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class DetailsTester<T extends Details> extends ComponentTester<T> {
 
     /**
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/dialog/DialogTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/dialog/DialogTester.java
index 5ffbafd67..f252abfb7 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/dialog/DialogTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/dialog/DialogTester.java
@@ -12,6 +12,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(Dialog.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class DialogTester extends ComponentTester<Dialog> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/grid/GridTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/grid/GridTester.java
index fe11e834a..65a7bc789 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/grid/GridTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/grid/GridTester.java
@@ -37,8 +37,14 @@
  *            component type
  * @param <Y>
  *            item type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(fqn = { "com.vaadin.flow.component.grid.Grid" })
+@Deprecated(forRemoval = true, since = "10.1")
 public class GridTester<T extends Grid<Y>, Y> extends ComponentTester<T> {
     /**
      * Wrap grid for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/AnchorTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/AnchorTester.java
index def951d79..abd52209c 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/AnchorTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/AnchorTester.java
@@ -32,6 +32,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(Anchor.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class AnchorTester extends HtmlContainerTester<Anchor> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/DescriptionListTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/DescriptionListTester.java
index b8135f320..f8ba07334 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/DescriptionListTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/DescriptionListTester.java
@@ -15,6 +15,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(DescriptionList.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class DescriptionListTester extends HtmlClickContainer<DescriptionList> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/DivTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/DivTester.java
index c57cea39d..dce5a70f5 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/DivTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/DivTester.java
@@ -12,6 +12,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(Div.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class DivTester extends HtmlClickContainer<Div> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/EmphasisTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/EmphasisTester.java
index 9f2ab4cd8..daed5a6c6 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/EmphasisTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/EmphasisTester.java
@@ -12,6 +12,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(Emphasis.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class EmphasisTester extends HtmlClickContainer<Emphasis> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/H1Tester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/H1Tester.java
index 42de512da..e06798f3c 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/H1Tester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/H1Tester.java
@@ -12,6 +12,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(H1.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class H1Tester extends HtmlClickContainer<H1> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/H2Tester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/H2Tester.java
index fc03a4a09..c39946c3a 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/H2Tester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/H2Tester.java
@@ -12,6 +12,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(H2.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class H2Tester extends HtmlClickContainer<H2> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/H3Tester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/H3Tester.java
index f39669e33..bb9bb4716 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/H3Tester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/H3Tester.java
@@ -12,6 +12,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(H3.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class H3Tester extends HtmlClickContainer<H3> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/H4Tester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/H4Tester.java
index 981ca47dc..7cbf3547f 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/H4Tester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/H4Tester.java
@@ -12,6 +12,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(H4.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class H4Tester extends HtmlClickContainer<H4> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/H5Tester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/H5Tester.java
index 1c0167aaa..0d1ade63b 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/H5Tester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/H5Tester.java
@@ -12,6 +12,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(H5.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class H5Tester extends HtmlClickContainer<H5> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/H6Tester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/H6Tester.java
index f4a6086a8..546ea4ff3 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/H6Tester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/H6Tester.java
@@ -12,6 +12,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(H6.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class H6Tester extends HtmlClickContainer<H6> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/HrTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/HrTester.java
index b9ac10205..eaa44b25b 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/HrTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/HrTester.java
@@ -12,6 +12,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(Hr.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class HrTester extends HtmlComponentTester<Hr> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/HtmlClickContainer.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/HtmlClickContainer.java
index 6fca6773e..19358f433 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/HtmlClickContainer.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/HtmlClickContainer.java
@@ -10,6 +10,7 @@
 
 import com.vaadin.flow.component.HtmlContainer;
 
+@Deprecated(forRemoval = true, since = "10.1")
 public abstract class HtmlClickContainer<T extends HtmlContainer>
         extends HtmlContainerTester<T> {
     /**
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/HtmlComponentTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/HtmlComponentTester.java
index 568c43f2d..7dce784c7 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/HtmlComponentTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/HtmlComponentTester.java
@@ -11,6 +11,7 @@
 import com.vaadin.flow.component.HtmlComponent;
 import com.vaadin.testbench.unit.ComponentTester;
 
+@Deprecated(forRemoval = true, since = "10.1")
 public class HtmlComponentTester<T extends HtmlComponent>
         extends ComponentTester<T> {
     /**
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/HtmlContainerTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/HtmlContainerTester.java
index e941db850..7a9d4c31b 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/HtmlContainerTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/HtmlContainerTester.java
@@ -10,6 +10,7 @@
 
 import com.vaadin.flow.component.HtmlContainer;
 
+@Deprecated(forRemoval = true, since = "10.1")
 public class HtmlContainerTester<T extends HtmlContainer>
         extends HtmlComponentTester<T> {
     /**
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/ImageTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/ImageTester.java
index dd6b35148..1fd3a51f8 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/ImageTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/ImageTester.java
@@ -12,6 +12,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(Image.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class ImageTester extends HtmlClickContainer<Image> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/InputTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/InputTester.java
index efe46ab5b..08db925ee 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/InputTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/InputTester.java
@@ -13,6 +13,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(Input.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class InputTester extends ComponentTester<Input> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/ListItemTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/ListItemTester.java
index f45085daf..fbf7898ef 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/ListItemTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/ListItemTester.java
@@ -12,6 +12,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(ListItem.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class ListItemTester extends HtmlClickContainer<ListItem> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/NativeButtonTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/NativeButtonTester.java
index 82df2a6c3..22bc3c4a7 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/NativeButtonTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/NativeButtonTester.java
@@ -12,6 +12,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(NativeButton.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class NativeButtonTester extends HtmlClickContainer<NativeButton> {
     /**
      * > Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/NativeDetailsTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/NativeDetailsTester.java
index 98eb04af4..6ce6d7ec2 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/NativeDetailsTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/NativeDetailsTester.java
@@ -14,6 +14,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(NativeDetails.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class NativeDetailsTester extends HtmlComponentTester<NativeDetails> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/NativeLabelTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/NativeLabelTester.java
index 7caab31ad..f4d47b71e 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/NativeLabelTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/NativeLabelTester.java
@@ -12,6 +12,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(NativeLabel.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class NativeLabelTester extends HtmlContainerTester<NativeLabel> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/OrderedListTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/OrderedListTester.java
index 7854c2b18..d32148dbc 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/OrderedListTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/OrderedListTester.java
@@ -16,6 +16,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(OrderedList.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class OrderedListTester extends HtmlClickContainer<OrderedList> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/ParagraphTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/ParagraphTester.java
index fa919e0db..20839292c 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/ParagraphTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/ParagraphTester.java
@@ -12,6 +12,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(Paragraph.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class ParagraphTester extends HtmlClickContainer<Paragraph> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/PreTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/PreTester.java
index 330e606e9..f5fb54a82 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/PreTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/PreTester.java
@@ -12,6 +12,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(Pre.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class PreTester extends HtmlClickContainer<Pre> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/RangeInputTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/RangeInputTester.java
index 994e14e60..8fd2d7d8c 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/RangeInputTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/RangeInputTester.java
@@ -15,6 +15,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(RangeInput.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class RangeInputTester extends ComponentTester<RangeInput> {
 
     /**
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/SpanTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/SpanTester.java
index 9cf5cbb5a..56958f45f 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/SpanTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/SpanTester.java
@@ -12,6 +12,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(Span.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class SpanTester extends HtmlClickContainer<Span> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/UnorderedListTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/UnorderedListTester.java
index 5fee01b10..5296a60c8 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/UnorderedListTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/html/testbench/UnorderedListTester.java
@@ -16,6 +16,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(UnorderedList.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class UnorderedListTester extends HtmlClickContainer<UnorderedList> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/listbox/ListBoxTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/listbox/ListBoxTester.java
index be250b84a..518464d78 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/listbox/ListBoxTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/listbox/ListBoxTester.java
@@ -22,8 +22,14 @@
  *            component type
  * @param <V>
  *            value type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(fqn = { "com.vaadin.flow.component.listbox.ListBox" })
+@Deprecated(forRemoval = true, since = "10.1")
 public class ListBoxTester<T extends ListBox<V>, V> extends ComponentTester<T> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/listbox/MultiSelectListBoxTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/listbox/MultiSelectListBoxTester.java
index 71c86001e..81f9fafa7 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/listbox/MultiSelectListBoxTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/listbox/MultiSelectListBoxTester.java
@@ -25,8 +25,14 @@
  *            component type
  * @param <V>
  *            value type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(fqn = { "com.vaadin.flow.component.listbox.MultiSelectListBox" })
+@Deprecated(forRemoval = true, since = "10.1")
 public class MultiSelectListBoxTester<T extends MultiSelectListBox<V>, V>
         extends ComponentTester<T> {
     /**
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/login/AbstractLoginTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/login/AbstractLoginTester.java
index a8691e16c..b7829d0ee 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/login/AbstractLoginTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/login/AbstractLoginTester.java
@@ -16,7 +16,13 @@
  *
  * @param <T>
  *            component type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
+@Deprecated(forRemoval = true, since = "10.1")
 public class AbstractLoginTester<T extends AbstractLogin>
         extends ComponentTester<T> {
     /**
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/login/LoginFormTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/login/LoginFormTester.java
index fc1e134bb..d0b7d21e8 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/login/LoginFormTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/login/LoginFormTester.java
@@ -15,8 +15,14 @@
  *
  * @param <T>
  *            component type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(LoginForm.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class LoginFormTester<T extends LoginForm>
         extends AbstractLoginTester<T> {
 
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/login/LoginOverlayTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/login/LoginOverlayTester.java
index 5743fb614..f01a0d104 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/login/LoginOverlayTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/login/LoginOverlayTester.java
@@ -17,8 +17,14 @@
  *
  * @param <T>
  *            component type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(LoginOverlay.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class LoginOverlayTester<T extends LoginOverlay>
         extends AbstractLoginTester<T> {
 
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/menubar/MenuBarTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/menubar/MenuBarTester.java
index be1f57603..f1b1ed6fb 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/menubar/MenuBarTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/menubar/MenuBarTester.java
@@ -25,8 +25,14 @@
  *
  * @param <T>
  *            component type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(MenuBar.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class MenuBarTester<T extends MenuBar> extends ComponentTester<T> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/messages/MessageInputTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/messages/MessageInputTester.java
index 0a50ad2a0..1d329ff8c 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/messages/MessageInputTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/messages/MessageInputTester.java
@@ -17,8 +17,14 @@
  *
  * @param <T>
  *            component type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(MessageInput.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class MessageInputTester<T extends MessageInput>
         extends ComponentTester<T> {
     /**
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/messages/MessageListTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/messages/MessageListTester.java
index 9616aca1b..92e18f485 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/messages/MessageListTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/messages/MessageListTester.java
@@ -20,8 +20,14 @@
  *
  * @param <T>
  *            component type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(MessageList.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class MessageListTester<T extends MessageList>
         extends ComponentTester<T> {
     /**
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/notification/NotificationTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/notification/NotificationTester.java
index 9dbf6f1cd..eca14ac03 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/notification/NotificationTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/notification/NotificationTester.java
@@ -18,8 +18,14 @@
  *
  * @param <T>
  *            component type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(Notification.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class NotificationTester<T extends Notification>
         extends ComponentTester<T> {
 
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/radiobutton/RadioButtonGroupTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/radiobutton/RadioButtonGroupTester.java
index f86fbbb0e..78a1aec9b 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/radiobutton/RadioButtonGroupTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/radiobutton/RadioButtonGroupTester.java
@@ -28,8 +28,14 @@
  *            component type
  * @param <V>
  *            value type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(fqn = "com.vaadin.flow.component.radiobutton.RadioButtonGroup")
+@Deprecated(forRemoval = true, since = "10.1")
 public class RadioButtonGroupTester<T extends RadioButtonGroup<V>, V>
         extends ComponentTester<T> {
     /**
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/radiobutton/RadioButtonTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/radiobutton/RadioButtonTester.java
index 9c4351cc3..d24bf2887 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/radiobutton/RadioButtonTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/radiobutton/RadioButtonTester.java
@@ -22,8 +22,14 @@
  *            component type
  * @param <V>
  *            value type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(fqn = "com.vaadin.flow.component.radiobutton.RadioButton")
+@Deprecated(forRemoval = true, since = "10.1")
 public class RadioButtonTester<T extends RadioButton<V>, V>
         extends ComponentTester<T> {
     /**
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/routerlink/RouterLinkTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/routerlink/RouterLinkTester.java
index 8368326f8..82badd18b 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/routerlink/RouterLinkTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/routerlink/RouterLinkTester.java
@@ -26,8 +26,14 @@
  *
  * @param <T>
  *            component type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(RouterLink.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class RouterLinkTester<T extends RouterLink> extends ComponentTester<T> {
 
     /**
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/select/SelectTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/select/SelectTester.java
index a925d284d..867398821 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/select/SelectTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/select/SelectTester.java
@@ -17,6 +17,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(fqn = { "com.vaadin.flow.component.select.Select" })
+@Deprecated(forRemoval = true, since = "10.1")
 public class SelectTester<T extends Select<Y>, Y> extends ComponentTester<T> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/sidenav/SideNavTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/sidenav/SideNavTester.java
index 02cf7bb20..6752cd442 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/sidenav/SideNavTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/sidenav/SideNavTester.java
@@ -15,6 +15,7 @@
 import com.vaadin.testbench.unit.Tests;
 
 @Tests(SideNav.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class SideNavTester<T extends SideNav> extends ComponentTester<T> {
 
     /**
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/tabs/TabSheetTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/tabs/TabSheetTester.java
index ab485b238..ad17d4edb 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/tabs/TabSheetTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/tabs/TabSheetTester.java
@@ -19,8 +19,14 @@
  *
  * @param <T>
  *            component type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(TabSheet.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class TabSheetTester<T extends TabSheet> extends ComponentTester<T> {
 
     /**
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/tabs/TabsTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/tabs/TabsTester.java
index 62657e1f9..1340219d7 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/tabs/TabsTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/tabs/TabsTester.java
@@ -19,8 +19,14 @@
  *
  * @param <T>
  *            component type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(Tabs.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class TabsTester<T extends Tabs> extends ComponentTester<T> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/textfield/NumberFieldTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/textfield/NumberFieldTester.java
index 43048e0e9..5c476e1e9 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/textfield/NumberFieldTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/textfield/NumberFieldTester.java
@@ -24,6 +24,7 @@
  */
 @Tests(fqn = { "com.vaadin.flow.component.textfield.IntegerField",
         "com.vaadin.flow.component.textfield.NumberField" })
+@Deprecated(forRemoval = true, since = "10.1")
 public class NumberFieldTester<T extends AbstractNumberField<T, V>, V extends Number>
         extends ComponentTester<T> {
     /**
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/textfield/TextAreaTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/textfield/TextAreaTester.java
index 2c4fad6d5..fa63f2952 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/textfield/TextAreaTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/textfield/TextAreaTester.java
@@ -18,8 +18,14 @@
  *
  * @param <T>
  *            component type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(TextArea.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class TextAreaTester<T extends TextArea> extends ComponentTester<T> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/textfield/TextFieldTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/textfield/TextFieldTester.java
index 4f7f541f7..7fdf6e313 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/textfield/TextFieldTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/textfield/TextFieldTester.java
@@ -24,6 +24,7 @@
  */
 @Tests({ TextField.class, PasswordField.class, EmailField.class,
         BigDecimalField.class })
+@Deprecated(forRemoval = true, since = "10.1")
 public class TextFieldTester<T extends TextFieldBase<T, V>, V>
         extends ComponentTester<T> {
 
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/timepicker/TimePickerTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/timepicker/TimePickerTester.java
index 2a6934ea9..ed346244e 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/timepicker/TimePickerTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/timepicker/TimePickerTester.java
@@ -21,8 +21,14 @@
  *
  * @param <T>
  *            component type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(TimePicker.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class TimePickerTester<T extends TimePicker> extends ComponentTester<T> {
     /**
      * Wrap given component for testing.
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/upload/UploadTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/upload/UploadTester.java
index 5d36cde8e..8b8d15df9 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/upload/UploadTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/upload/UploadTester.java
@@ -49,8 +49,14 @@
  *
  * @param <T>
  *            the component type.
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(Upload.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class UploadTester<T extends Upload> extends ComponentTester<T> {
 
     /**
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/virtuallist/VirtualListTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/virtuallist/VirtualListTester.java
index 7504b1ec0..0448ea231 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/virtuallist/VirtualListTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/flow/component/virtuallist/VirtualListTester.java
@@ -29,8 +29,14 @@
  *            component type
  * @param <Y>
  *            value type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Tests(VirtualList.class)
+@Deprecated(forRemoval = true, since = "10.1")
 public class VirtualListTester<T extends VirtualList<Y>, Y>
         extends ComponentTester<T> {
 
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/BaseUIUnitTest.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/BaseUIUnitTest.java
index 2630c6d48..207b703d3 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/BaseUIUnitTest.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/BaseUIUnitTest.java
@@ -63,7 +63,13 @@
  * For internal use only. May be renamed or removed in a future release.
  *
  * @see ViewPackages
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
+@Deprecated(forRemoval = true, since = "10.1")
 public abstract class BaseUIUnitTest {
 
     private static final Logger LOGGER = LoggerFactory
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/Clickable.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/Clickable.java
index 79c58254c..9a20c1595 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/Clickable.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/Clickable.java
@@ -20,7 +20,13 @@
  *
  * @param <T>
  *            the type of component being tested
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
+@Deprecated(forRemoval = true, since = "10.1")
 public interface Clickable<T extends Component> {
 
     /**
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/CommercialTesterWrappers.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/CommercialTesterWrappers.java
index 4f90ef3fb..956017663 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/CommercialTesterWrappers.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/CommercialTesterWrappers.java
@@ -13,8 +13,14 @@
 
 /**
  * Provides factory method to create testers for commercial components.
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @SuppressWarnings("unchecked")
+@Deprecated(forRemoval = true, since = "10.1")
 public interface CommercialTesterWrappers {
 
     /**
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/ComponentQuery.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/ComponentQuery.java
index a80d26a5b..dfcfe826e 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/ComponentQuery.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/ComponentQuery.java
@@ -37,7 +37,13 @@
  * @param <T>
  *            the type of the component(s) to search for
  * @see ComponentTester
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
+@Deprecated(forRemoval = true, since = "10.1")
 public class ComponentQuery<T extends Component> {
 
     private final Class<T> componentType;
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/ComponentTester.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/ComponentTester.java
index 029af8c6d..bbcff7403 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/ComponentTester.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/ComponentTester.java
@@ -38,7 +38,13 @@
  *
  * @param <T>
  *            component type
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
+@Deprecated(forRemoval = true, since = "10.1")
 public class ComponentTester<T extends Component> implements Clickable<T> {
 
     private final T component;
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/ComponentTesterPackages.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/ComponentTesterPackages.java
index 4cf7429b5..ec32e35a5 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/ComponentTesterPackages.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/ComponentTesterPackages.java
@@ -19,9 +19,15 @@
  * <p/>
  * This makes adding custom component wrappers simpler as they can then use
  * package protected fields and methods.
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Target({ ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
+@Deprecated(forRemoval = true, since = "10.1")
 public @interface ComponentTesterPackages {
 
     /**
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/ElementConditions.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/ElementConditions.java
index 732a03724..134ebc218 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/ElementConditions.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/ElementConditions.java
@@ -25,7 +25,13 @@
  * conditions.
  *
  * @see ComponentQuery#withCondition(Predicate)
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
+@Deprecated(forRemoval = true, since = "10.1")
 public final class ElementConditions {
 
     private ElementConditions() {
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/LitRendererTestUtil.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/LitRendererTestUtil.java
index 27c84b496..4b8ba0a0e 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/LitRendererTestUtil.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/LitRendererTestUtil.java
@@ -22,7 +22,13 @@
 
 /**
  * Utility methods for unit testing properties and functions of LitRenderers.
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
+@Deprecated(forRemoval = true, since = "10.1")
 public class LitRendererTestUtil {
 
     private LitRendererTestUtil() throws InstantiationException {
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/MetaKeys.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/MetaKeys.java
index 959140755..97ff46c54 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/MetaKeys.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/MetaKeys.java
@@ -10,7 +10,13 @@
 
 /**
  * Class for setting any down meta keys for events supporting meta keys.
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
+@Deprecated(forRemoval = true, since = "10.1")
 public class MetaKeys {
     private boolean ctrl = false;
     private boolean shift = false;
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/MouseButton.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/MouseButton.java
index f43583737..cb31d0fd2 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/MouseButton.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/MouseButton.java
@@ -21,7 +21,13 @@
  * <dt>4: The second additional button, typically the forward button</dt>
  * <dt>5+: More additional buttons without any typical meanings</dt>
  * </dl>
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
+@Deprecated(forRemoval = true, since = "10.1")
 public enum MouseButton {
 
     NO_BUTTON(-1), LEFT(0), MIDDLE(1), RIGHT(2), BACK(3), FORWARD(4);
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/SerializationDebugUtil.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/SerializationDebugUtil.java
index 711130d18..378148ea3 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/SerializationDebugUtil.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/SerializationDebugUtil.java
@@ -22,6 +22,7 @@
 import java.util.List;
 import java.util.Set;
 
+@Deprecated(forRemoval = true, since = "10.1")
 public final class SerializationDebugUtil {
 
     private SerializationDebugUtil() {
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/TesterWrappers.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/TesterWrappers.java
index a9de7c335..3f02163e2 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/TesterWrappers.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/TesterWrappers.java
@@ -126,6 +126,7 @@
 import com.vaadin.flow.router.RouterLink;
 
 @SuppressWarnings("unchecked")
+@Deprecated(forRemoval = true, since = "10.1")
 public interface TesterWrappers {
 
     default AccordionTester<Accordion> test(Accordion accordion) {
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/Tests.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/Tests.java
index e777aae0b..8d57fe2ec 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/Tests.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/Tests.java
@@ -21,9 +21,15 @@
  * <p/>
  * This is used for automatically selecting a wrapper implementation for a given
  * component.
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Target({ ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
+@Deprecated(forRemoval = true, since = "10.1")
 public @interface Tests {
 
     /**
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/UITestSpringLookupInitializer.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/UITestSpringLookupInitializer.java
index 5e882cf91..513901f7e 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/UITestSpringLookupInitializer.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/UITestSpringLookupInitializer.java
@@ -34,7 +34,13 @@
  * be initialized correctly.
  *
  * For internal use only.
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
+@Deprecated(forRemoval = true, since = "10.1")
 public class UITestSpringLookupInitializer extends SpringLookupInitializer
         implements TestExecutionListener {
 
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/UIUnitTestSetupException.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/UIUnitTestSetupException.java
index 837debcd2..5d27d66ed 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/UIUnitTestSetupException.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/UIUnitTestSetupException.java
@@ -11,7 +11,13 @@
 /**
  * Exception thrown by {@link BaseUIUnitTest} methods when the mock environment
  * has not been set up correctly.
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
+@Deprecated(forRemoval = true, since = "10.1")
 public class UIUnitTestSetupException extends RuntimeException {
     public UIUnitTestSetupException(String message) {
         super(message);
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/ViewPackages.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/ViewPackages.java
index 92bf29219..083a33516 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/ViewPackages.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/ViewPackages.java
@@ -22,10 +22,16 @@
  *
  * If both {@link #classes()} and {@link #packages()} are empty, the scan is
  * assumed to be limited to the annotated class package.
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 @Documented
+@Deprecated(forRemoval = true, since = "10.1")
 public @interface ViewPackages {
 
     /**
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/mocks/MockSpringServlet.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/mocks/MockSpringServlet.java
index 5bc1c3413..208a346da 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/mocks/MockSpringServlet.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/mocks/MockSpringServlet.java
@@ -39,7 +39,13 @@
  * {@link com.vaadin.flow.spring.SpringVaadinServletService}.
  *
  * @author mavi
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
+@Deprecated(forRemoval = true, since = "10.1")
 public class MockSpringServlet extends SpringServlet {
 
     @NotNull
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/mocks/MockSpringServletService.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/mocks/MockSpringServletService.java
index 71d150461..85c55b3ed 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/mocks/MockSpringServletService.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/mocks/MockSpringServletService.java
@@ -33,7 +33,13 @@
  * The class is intentionally opened, to be extensible in user's library.
  *
  * @author mavi
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
+@Deprecated(forRemoval = true, since = "10.1")
 public class MockSpringServletService extends SpringVaadinServletService {
     @NotNull
     private final UIFactory uiFactory;
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/mocks/MockSpringVaadinSession.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/mocks/MockSpringVaadinSession.java
index 13ac97ffa..56054f509 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/mocks/MockSpringVaadinSession.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/mocks/MockSpringVaadinSession.java
@@ -29,7 +29,13 @@
  * </ul>
  *
  * @author mavi
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
+@Deprecated(forRemoval = true, since = "10.1")
 public class MockSpringVaadinSession extends VaadinSession {
     @NotNull
     private final UIFactory uiFactory;
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/mocks/MockWebApplicationContext.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/mocks/MockWebApplicationContext.java
index 65f3c6579..72df32010 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/mocks/MockWebApplicationContext.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/mocks/MockWebApplicationContext.java
@@ -35,7 +35,13 @@
  * WebApplicationContext.
  *
  * For internal use only.
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
+@Deprecated(forRemoval = true, since = "10.1")
 public class MockWebApplicationContext implements WebApplicationContext {
 
     private final ApplicationContext appCtx;
diff --git a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/mocks/SpringSecurityRequestCustomizer.java b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/mocks/SpringSecurityRequestCustomizer.java
index 67972dee2..35a044366 100644
--- a/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/mocks/SpringSecurityRequestCustomizer.java
+++ b/vaadin-testbench-unit-shared/src/main/java/com/vaadin/testbench/unit/mocks/SpringSecurityRequestCustomizer.java
@@ -14,7 +14,13 @@
  * Configures mock request with authentication details from Spring Security.
  *
  * For internal use only.
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
+@Deprecated(forRemoval = true, since = "10.1")
 public class SpringSecurityRequestCustomizer implements MockRequestCustomizer {
 
     @Override
diff --git a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/DepthFirstTreeIterator.kt b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/DepthFirstTreeIterator.kt
index 2a64e6585..eb7bd32d8 100644
--- a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/DepthFirstTreeIterator.kt
+++ b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/DepthFirstTreeIterator.kt
@@ -20,6 +20,7 @@ import com.vaadin.flow.component.Component
  * @param root start here.
  * @param children fetches children of given node.
  */
+@Deprecated("Replace the vaadin-testbench-unit dependency with browserless-test-junit6 and use the corresponding class from the com.vaadin.browserless package instead. This class will be removed in a future version.")
 class DepthFirstTreeIterator<out T>(root: T, private val children: (T) -> List<T>) : Iterator<T> {
     private val queue: Deque<T> = LinkedList(listOf(root))
     override fun hasNext(): Boolean = !queue.isEmpty()
diff --git a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/Locator.kt b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/Locator.kt
index 9ac33fcf9..41a3d0172 100644
--- a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/Locator.kt
+++ b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/Locator.kt
@@ -38,6 +38,7 @@ import com.vaadin.flow.router.InternalServerError
  * @property themes if not null, the component must have all theme names defined. Space-separated
  * @property withoutThemes if not null, the component must NOT have any of the theme names defined. Space-separated
  */
+@Deprecated("Replace the vaadin-testbench-unit dependency with browserless-test-junit6 and use the corresponding class from the com.vaadin.browserless package instead. This class will be removed in a future version.")
 class SearchSpec<T : Component>(
         val clazz: Class<T>,
         var id: String? = null,
diff --git a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/MockVaadin.kt b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/MockVaadin.kt
index 3879a6379..45b9a0ec2 100644
--- a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/MockVaadin.kt
+++ b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/MockVaadin.kt
@@ -49,6 +49,7 @@ import com.vaadin.testbench.unit.mocks.createVaadinServletRequest
 import com.vaadin.testbench.unit.mocks.createVaadinServletResponse
 import com.vaadin.testbench.unit.mocks.serviceSafe
 
+@Deprecated("Replace the vaadin-testbench-unit dependency with browserless-test-junit6 and use the corresponding class from the com.vaadin.browserless package instead. This class will be removed in a future version.")
 object MockVaadin {
     // prevent GC on Vaadin Session and Vaadin UI as they are only soft-referenced from the Vaadin itself.
     // use ThreadLocals so that multiple threads may initialize fresh Vaadin instances at the same time.
@@ -441,8 +442,10 @@ private class MockPage(ui: UI, private val uiFactory: UIFactory, private val ses
     }
 }
 
+@Deprecated("Replace the vaadin-testbench-unit dependency with browserless-test-junit6 and use the corresponding class from the com.vaadin.browserless package instead. This class will be removed in a future version.")
 fun interface MockRequestCustomizer {
     fun apply(request: MockRequest)
 }
 
+@Deprecated("Replace the vaadin-testbench-unit dependency with browserless-test-junit6 and use the corresponding class from the com.vaadin.browserless package instead. This class will be removed in a future version.")
 fun interface UIFactory : () -> UI, Serializable
diff --git a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/PrettyPrintTree.kt b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/PrettyPrintTree.kt
index f434dcd3d..23b9ce4bf 100644
--- a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/PrettyPrintTree.kt
+++ b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/PrettyPrintTree.kt
@@ -36,6 +36,7 @@ var prettyPrintUseAscii: Boolean = false
  *
  * To create a pretty tree dump of a Vaadin component, just use [ofVaadin].
  */
+@Deprecated("Replace the vaadin-testbench-unit dependency with browserless-test-junit6 and use the corresponding class from the com.vaadin.browserless package instead. This class will be removed in a future version.")
 class PrettyPrintTree(val name: String, val children: MutableList<PrettyPrintTree>) {
 
     private val pipe = if (!prettyPrintUseAscii) '│' else '|'
diff --git a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/Routes.kt b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/Routes.kt
index c2a8386de..27f590a4a 100644
--- a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/Routes.kt
+++ b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/Routes.kt
@@ -41,6 +41,7 @@ import io.github.classgraph.ScanResult
  * @property skipPwaInit if true, the PWA initialization code is skipped in Vaadin, which dramatically speeds up
  * the [MockVaadin.setup] from 2 seconds to 50ms. Since that's usually what you want to do, this defaults to true.
  */
+@Deprecated("Replace the vaadin-testbench-unit dependency with browserless-test-junit6 and use the corresponding class from the com.vaadin.browserless package instead. This class will be removed in a future version.")
 data class Routes(
         val routes: MutableSet<Class<out Component>> = mutableSetOf(),
         val errorRoutes: MutableSet<Class<out HasErrorParameter<*>>> = mutableSetOf(MockRouteNotFoundError::class.java),
@@ -136,6 +137,7 @@ fun ApplicationRouteRegistry.clearPwaClass() {
  */
 @Tag(Tag.DIV)
 @DefaultErrorHandler
+@Deprecated("Replace the vaadin-testbench-unit dependency with browserless-test-junit6 and use the corresponding class from the com.vaadin.browserless package instead. This class will be removed in a future version.")
 open class MockRouteNotFoundError : RouteNotFoundError() {
 
     var cause: NotFoundException? = null;
@@ -165,6 +167,7 @@ open class MockRouteNotFoundError : RouteNotFoundError() {
 }
 
 @DefaultErrorHandler
+@Deprecated("Replace the vaadin-testbench-unit dependency with browserless-test-junit6 and use the corresponding class from the com.vaadin.browserless package instead. This class will be removed in a future version.")
 open class MockInternalSeverError : InternalServerError() {
 
     override fun setErrorParameter(event: BeforeEnterEvent, parameter: ErrorParameter<Exception>): Int {
diff --git a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/TestingLifecycleHook.kt b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/TestingLifecycleHook.kt
index c278ac598..6d9a763c4 100644
--- a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/TestingLifecycleHook.kt
+++ b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/internal/TestingLifecycleHook.kt
@@ -34,6 +34,7 @@ import com.vaadin.flow.component.menubar.MenuBar
  * roundtrip before every component lookup
  * via the [_get]/[_find]/[_expectNone]/[_expectOne] call. Therefore, [MockVaadin.clientRoundtrip] is called from [awaitBeforeLookup] by default.
  */
+@Deprecated("Replace the vaadin-testbench-unit dependency with browserless-test-junit6 and use the corresponding class from the com.vaadin.browserless package instead. This class will be removed in a future version.")
 interface TestingLifecycleHook {
     /**
      * Invoked before every component lookup. You can e.g. wait for any async operations to finish and for the server to settle down.
diff --git a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockContext.kt b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockContext.kt
index 49f79d033..f5f6f5f1d 100644
--- a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockContext.kt
+++ b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockContext.kt
@@ -30,6 +30,7 @@ import jakarta.servlet.SessionTrackingMode
 import jakarta.servlet.descriptor.JspConfigDescriptor
 import org.slf4j.LoggerFactory
 
+@Deprecated("Replace the vaadin-testbench-unit dependency with browserless-test-junit6 and use the corresponding class from the com.vaadin.browserless package instead. This class will be removed in a future version.")
 open class MockContext : ServletContext, Serializable {
 
     override fun <T : Servlet?> createServlet(clazz: Class<T>?): T {
diff --git a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockHttpEnvironment.kt b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockHttpEnvironment.kt
index f06fa5a94..f3a563963 100644
--- a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockHttpEnvironment.kt
+++ b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockHttpEnvironment.kt
@@ -15,6 +15,7 @@ import jakarta.servlet.ServletConfig
 import jakarta.servlet.ServletContext
 
 
+@Deprecated("Replace the vaadin-testbench-unit dependency with browserless-test-junit6 and use the corresponding class from the com.vaadin.browserless package instead. This class will be removed in a future version.")
 open class MockServletConfig(val context: ServletContext) : ServletConfig {
 
     /**
@@ -35,6 +36,7 @@ internal fun <K, V> MutableMap<K, V>.putOrRemove(key: K, value: V?) {
     if (value == null) remove(key) else set(key, value)
 }
 
+@Deprecated("Replace the vaadin-testbench-unit dependency with browserless-test-junit6 and use the corresponding class from the com.vaadin.browserless package instead. This class will be removed in a future version.")
 object MockHttpEnvironment {
     /**
      * [MockRequest.getLocalPort]
diff --git a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockHttpSession.kt b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockHttpSession.kt
index a6c817055..944d9a200 100644
--- a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockHttpSession.kt
+++ b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockHttpSession.kt
@@ -23,6 +23,7 @@ import jakarta.servlet.http.HttpSession
 /**
  * A standalone implementation of the [HttpSession] interface.
  */
+@Deprecated("Replace the vaadin-testbench-unit dependency with browserless-test-junit6 and use the corresponding class from the com.vaadin.browserless package instead. This class will be removed in a future version.")
 open class MockHttpSession(
         private val sessionId: String,
         private val servletContext: ServletContext,
diff --git a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockInstantiator.kt b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockInstantiator.kt
index 045b8b788..db6c4f754 100644
--- a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockInstantiator.kt
+++ b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockInstantiator.kt
@@ -19,6 +19,7 @@ import net.bytebuddy.matcher.ElementMatchers
 /**
  * Makes sure to load [MockNpmTemplateParser].
  */
+@Deprecated("Replace the vaadin-testbench-unit dependency with browserless-test-junit6 and use the corresponding class from the com.vaadin.browserless package instead. This class will be removed in a future version.")
 open class MockInstantiator(val delegate: Instantiator) : Instantiator by delegate {
 
     @Suppress("UNCHECKED_CAST")
diff --git a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockRequest.kt b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockRequest.kt
index 341026195..d23fdf7ad 100644
--- a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockRequest.kt
+++ b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockRequest.kt
@@ -30,6 +30,7 @@ import java.util.Enumeration
 import java.util.Locale
 import java.util.concurrent.ConcurrentHashMap
 
+@Deprecated("Replace the vaadin-testbench-unit dependency with browserless-test-junit6 and use the corresponding class from the com.vaadin.browserless package instead. This class will be removed in a future version.")
 open class MockRequest(private var session: HttpSession) : HttpServletRequest {
 
     override fun getInputStream(): ServletInputStream {
diff --git a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockResponse.kt b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockResponse.kt
index df70dca83..5b811d917 100644
--- a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockResponse.kt
+++ b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockResponse.kt
@@ -18,6 +18,7 @@ import jakarta.servlet.ServletOutputStream
 import jakarta.servlet.http.Cookie
 import jakarta.servlet.http.HttpServletResponse
 
+@Deprecated("Replace the vaadin-testbench-unit dependency with browserless-test-junit6 and use the corresponding class from the com.vaadin.browserless package instead. This class will be removed in a future version.")
 open class MockResponse : HttpServletResponse {
     override fun encodeURL(url: String): String = url
 
diff --git a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockService.kt b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockService.kt
index 7f8878aa1..a61401fa0 100644
--- a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockService.kt
+++ b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockService.kt
@@ -29,6 +29,7 @@ import com.vaadin.testbench.unit.internal.UIFactory
  *
  * To register your custom `MockService` instance, override [MockVaadinServlet.createServletService].
  */
+@Deprecated("Replace the vaadin-testbench-unit dependency with browserless-test-junit6 and use the corresponding class from the com.vaadin.browserless package instead. This class will be removed in a future version.")
 open class MockService(servlet: VaadinServlet,
                               deploymentConfiguration: DeploymentConfiguration,
                               val uiFactory: UIFactory = UIFactory { MockedUI() }
diff --git a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockVaadinHelper.kt b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockVaadinHelper.kt
index 691cdc569..eaf8d9df7 100644
--- a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockVaadinHelper.kt
+++ b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockVaadinHelper.kt
@@ -22,6 +22,7 @@ import com.vaadin.testbench.unit.internal.findClassOrThrow
 import tools.jackson.databind.ObjectMapper
 import tools.jackson.databind.node.ObjectNode
 
+@Deprecated("Replace the vaadin-testbench-unit dependency with browserless-test-junit6 and use the corresponding class from the com.vaadin.browserless package instead. This class will be removed in a future version.")
 object MockVaadinHelper {
 
     private val flowBuildInfo: ObjectNode? by lazy(LazyThreadSafetyMode.PUBLICATION) {
diff --git a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockVaadinServlet.kt b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockVaadinServlet.kt
index 59287ce04..99e24f016 100644
--- a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockVaadinServlet.kt
+++ b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockVaadinServlet.kt
@@ -24,6 +24,7 @@ import jakarta.servlet.http.HttpServletResponse
  *
  * To use a custom servlet instead of this one, just pass it to [MockVaadin.setup].
  */
+@Deprecated("Replace the vaadin-testbench-unit dependency with browserless-test-junit6 and use the corresponding class from the com.vaadin.browserless package instead. This class will be removed in a future version.")
 open class MockVaadinServlet @JvmOverloads constructor(
         val routes: Routes = Routes(),
         val uiFactory: UIFactory = UIFactory{ MockedUI() }
diff --git a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockVaadinSession.kt b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockVaadinSession.kt
index 561638fcf..f61bc5db7 100644
--- a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockVaadinSession.kt
+++ b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockVaadinSession.kt
@@ -22,6 +22,7 @@ import com.vaadin.testbench.unit.internal.UIFactory
  *   In order to do that, simply override [close], call `super.close()` then call
  *   [MockVaadin.afterSessionClose].
  */
+@Deprecated("Replace the vaadin-testbench-unit dependency with browserless-test-junit6 and use the corresponding class from the com.vaadin.browserless package instead. This class will be removed in a future version.")
 open class MockVaadinSession(service: VaadinService,
                              val uiFactory: UIFactory
 ) : VaadinSession(service) {
diff --git a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockedUI.kt b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockedUI.kt
index a0afebcbb..fb52b20e4 100644
--- a/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockedUI.kt
+++ b/vaadin-testbench-unit-shared/src/main/kotlin/com/vaadin/testbench/unit/mocks/MockedUI.kt
@@ -25,6 +25,7 @@ import com.vaadin.testbench.unit.internal.simulateClosedEvent
  * A simple no-op UI used by default by [com.vaadin.testbench.unit.MockVaadin.setup].
  * The class is open, in order to be extensible in user's library
  */
+@Deprecated("Replace the vaadin-testbench-unit dependency with browserless-test-junit6 and use the corresponding class from the com.vaadin.browserless package instead. This class will be removed in a future version.")
 open class MockedUI : UI() {
 
     override fun setChildComponentModal(childComponent: Component?, mode: ModalityMode) {
diff --git a/vaadin-testbench-unit/src/main/java/com/vaadin/testbench/unit/SpringUIUnit4Test.java b/vaadin-testbench-unit/src/main/java/com/vaadin/testbench/unit/SpringUIUnit4Test.java
index 597190a1c..62238bb59 100644
--- a/vaadin-testbench-unit/src/main/java/com/vaadin/testbench/unit/SpringUIUnit4Test.java
+++ b/vaadin-testbench-unit/src/main/java/com/vaadin/testbench/unit/SpringUIUnit4Test.java
@@ -51,9 +51,15 @@
  * }
  * }
  * </pre>
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ *             browserless-test-junit6 and use the corresponding class from the
+ *             com.vaadin.browserless package instead. This class will be
+ *             removed in a future version.
  */
 @RunWith(SpringRunner.class)
 @TestExecutionListeners(listeners = UITestSpringLookupInitializer.class, mergeMode = TestExecutionListeners.MergeMode.MERGE_WITH_DEFAULTS)
+@Deprecated(forRemoval = true, since = "10.1")
 public abstract class SpringUIUnit4Test extends UIUnit4Test {
 
     @Autowired
diff --git a/vaadin-testbench-unit/src/main/java/com/vaadin/testbench/unit/UIUnit4Test.java b/vaadin-testbench-unit/src/main/java/com/vaadin/testbench/unit/UIUnit4Test.java
index cd5813b87..6b00c06d5 100644
--- a/vaadin-testbench-unit/src/main/java/com/vaadin/testbench/unit/UIUnit4Test.java
+++ b/vaadin-testbench-unit/src/main/java/com/vaadin/testbench/unit/UIUnit4Test.java
@@ -66,7 +66,13 @@
  * <p/>
  * To get a graphical ascii representation of the UI tree on failure override
  * the {@link #printTree()} method to return true.
+ * 
+ * @deprecated Replace the vaadin-testbench-unit dependency with
+ * browserless-test-junit6 and use the corresponding class from the
+ * com.vaadin.browserless package instead. This class will be removed in a
+ * future version.
  */
+@Deprecated(forRemoval = true, since = "10.1")
 public abstract class UIUnit4Test extends BaseUIUnitTest
         implements TesterWrappers {