diff --git a/apps/app/ui-tests-app/button/btn-wrap-text-alignment-4266.xml b/apps/app/ui-tests-app/button/btn-wrap-text-alignment-4266.xml
index 3b7fa1b25..41d3cb30a 100644
--- a/apps/app/ui-tests-app/button/btn-wrap-text-alignment-4266.xml
+++ b/apps/app/ui-tests-app/button/btn-wrap-text-alignment-4266.xml
@@ -4,10 +4,10 @@
             <NavigationButton text="Go Back" android.systemIcon="ic_menu_back"></NavigationButton>
         </ActionBar>
     </Page.actionBar>
-    <StackLayout>
+    <GridLayout rows="*,*,*,*">
         <Button text="This a test of a wrapping button [CENTER]" textWrap="true" style="text-align:center; width:100" />
         <Button row="1" text="This a test of a wrapping button [RIGHT]" textWrap="true" style="text-align:right;width:100" />
         <Button row="2" text="This a test of a wrapping button [LEFT]" textWrap="true" style="text-align:left;width:100" />
         <Button row="3" text="&#xf8ff; This a test of a wrapping button [CENTER ICON]" textWrap="true" style="text-align:center;width:100" />
-    </StackLayout>
+    </GridLayout>
 </Page> 
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/text-field/main-page.ts b/apps/app/ui-tests-app/text-field/main-page.ts
index f50fd95ba..93173ff5a 100644
--- a/apps/app/ui-tests-app/text-field/main-page.ts
+++ b/apps/app/ui-tests-app/text-field/main-page.ts
@@ -14,6 +14,6 @@ export function loadExamples() {
     examples.set("secured-text-field", "text-field/secured-text-field-4135");
     examples.set("max-length", "text-field/max-length");
     examples.set("text-field-border", "text-field/text-field-border");
-    examples.set("hint-text-color", "text-field/hint-text-color");
+
     return examples;
 }
diff --git a/apps/app/ui-tests-app/text-field/hint-text-color.ts b/apps/app/ui-tests-app/text-view/hint-text-color.ts
similarity index 100%
rename from apps/app/ui-tests-app/text-field/hint-text-color.ts
rename to apps/app/ui-tests-app/text-view/hint-text-color.ts
diff --git a/apps/app/ui-tests-app/text-field/hint-text-color.xml b/apps/app/ui-tests-app/text-view/hint-text-color.xml
similarity index 100%
rename from apps/app/ui-tests-app/text-field/hint-text-color.xml
rename to apps/app/ui-tests-app/text-view/hint-text-color.xml
diff --git a/apps/app/ui-tests-app/text-view/main-page.ts b/apps/app/ui-tests-app/text-view/main-page.ts
index b39e7dfce..71372d5d9 100644
--- a/apps/app/ui-tests-app/text-view/main-page.ts
+++ b/apps/app/ui-tests-app/text-view/main-page.ts
@@ -13,5 +13,6 @@ export function loadExamples() {
     const examples = new Map<string, string>();
     examples.set("text-view-border", "text-view/text-view-border");
     examples.set("text-view-hint-color", "text-view/text-view-hint-color");
+    examples.set("hint-text-color", "text-view/hint-text-color");
     return examples;
 }
\ No newline at end of file