diff --git a/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/TimePickersPage.java b/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/TimePickersPage.java
index ad0c45c393..52f380ba26 100644
--- a/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/TimePickersPage.java
+++ b/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/TimePickersPage.java
@@ -8,17 +8,16 @@
 
 public class TimePickersPage extends VuetifyPage {
 
-    // @todo #5298 Locators should use .v-picker class for TimePickers
-    @UI("#AllowedTimesTimePicker > div:nth-child(1)")
+    @UI("#AllowedTimesTimePicker .v-picker--time")
     public static TimePicker allowedTimesTimePicker;
 
-    @UI("#AMPMInTitleTimePicker > div:nth-child(1)")
+    @UI("#AMPMInTitleTimePicker .v-picker--time")
     public static TimePicker amPmInTitleTimePicker;
 
     @UI("#AMPMInTitleTimePicker > div:nth-child(2)")
     public static TimePicker secondAmPmInTitleTimePicker;
 
-    @UI("#ColorsTimePicker > div:nth-child(1)")
+    @UI("#ColorsTimePicker .v-picker--time")
     public static TimePicker firstColorTimePicker;
 
     @UI("#DisabledTimePicker > div:nth-child(1)")
@@ -27,41 +26,45 @@ public class TimePickersPage extends VuetifyPage {
     @UI("#ElevationTimePicker > div:nth-child(2)")
     public static TimePicker elevatedTimePicker;
 
-    @UI("#FormatTimePicker > div")
+    @UI("#FormatTimePicker .v-picker--time")
     public static TimePicker formatTimePicker;
 
-    @UI("#NoTitleTimePicker > div:nth-child(1)")
+    @UI("#NoTitleTimePicker .v-picker--time")
     public static TimePicker noTitleTimePicker;
 
     @UI("#NoTitleTimePicker > div:nth-child(2)")
     public static TimePicker verticalNoTitleTimePicker;
 
-    @UI("#ScrollableTimePicker > .v-picker")
+    @UI("#ScrollableTimePicker > .v-picker--time")
     public static TimePicker scrollableTimePicker;
 
-    @UI("#ReadOnlyTimePicker > div:nth-child(1)")
+    @UI("#ReadOnlyTimePicker > .v-picker--time")
     public static TimePicker readOnlyTimePicker;
 
-    @UI("#UseSecondsTimePicker > div:nth-child(1)")
+    @UI("#UseSecondsTimePicker > .v-picker--time")
     public static TimePicker useSecondsTimePicker1;
 
     @UI("#UseSecondsTimePicker > div:nth-child(2)")
     public static TimePicker useSecondsTimePicker2;
 
-    @UI("#WidthTimePicker > div:nth-child(1)")
+    @UI("#WidthTimePicker > .v-picker--time")
     public static TimePicker firstWidthTimePicker;
 
-    @UI("#DialogAndMenuTimePicker > div:nth-child(1)")
+    // @todo #5369 Menu with TimePicker should be described as a separate component,
+    //  may be input with menu to change data
+    @UI("#DialogAndMenuTimePicker .v-input")
     public static Input inputForMenuTimePicker;
     @UI("div[role='menu']")
     public static Menu menuForTimePicker;
-    @UI("div.v-menu__content")
+    @UI("div.v-menu__content > .v-picker--time")
     public static TimePicker timePickerInMenu;
 
+    // @todo #5369 Dialog with TimePicker should be described as a separate component
+    //  may be input with dialog to change data
     @UI("#DialogAndMenuTimePicker > div:nth-child(3)")
     public static Input inputForDialogTimePicker;
     @UI("div[role='dialog']")
     public static Dialog dialogForTimePicker;
-    @UI("div.v-dialog__content")
+    @UI("div.v-dialog__content > > .v-picker--time")
     public static TimePicker timePickerInDialog;
 }