diff --git a/apps/app/ui-tests-app/events/listview_binding.ts b/apps/app/ui-tests-app/list-view/listview-binding.ts
similarity index 100%
rename from apps/app/ui-tests-app/events/listview_binding.ts
rename to apps/app/ui-tests-app/list-view/listview-binding.ts
diff --git a/apps/app/ui-tests-app/list-view/main-page.ts b/apps/app/ui-tests-app/list-view/main-page.ts
index 1ceda378b..484cc9864 100644
--- a/apps/app/ui-tests-app/list-view/main-page.ts
+++ b/apps/app/ui-tests-app/list-view/main-page.ts
@@ -13,6 +13,7 @@ export function pageLoaded(args: EventData) {
     
     examples.set("list-view-templates", "list-view/list-view");
     examples.set("images-template", "list-view/images-template");
+    examples.set("bindings", "list-view/listview-binding");
 
     let viewModel = new SubMainPageViewModel(wrapLayout, examples);
     page.bindingContext = viewModel;
diff --git a/apps/app/ui-tests-app/list-view/max-length.xml b/apps/app/ui-tests-app/list-view/max-length.xml
new file mode 100644
index 000000000..7fc095bbc
--- /dev/null
+++ b/apps/app/ui-tests-app/list-view/max-length.xml
@@ -0,0 +1,14 @@
+<Page loaded="pageLoaded">
+    <Page.actionBar>
+        <ActionBar title="maxLength" />
+    </Page.actionBar>
+    <StackLayout>
+        <TextField id="maxLenghtFromCodeBehindWithText" hint="max lenght and text from code behind" maxLength="3" />
+        <TextField id="maxLenghtFromCodeBehind" hint="set only max length from code behind" />
+        <TextField id="inXml" text="in xml" hint="in xml" maxLength="3" />
+        <TextField id="useInput" hint="user input" maxLength="3" />
+        <TextField id="useInput" hint="user input" maxLength="3" secure="true" />
+        
+        <Button tap="setText" text="Revert to initial state" />
+    </StackLayout>
+</Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/mainPage.ts b/apps/app/ui-tests-app/mainPage.ts
index 88eeb08a4..a6c4eccda 100644
--- a/apps/app/ui-tests-app/mainPage.ts
+++ b/apps/app/ui-tests-app/mainPage.ts
@@ -14,34 +14,42 @@ export function pageLoaded(args: EventData) {
 
     let page = <Page>args.object;
     let wrapLayout = page.getViewById<WrapLayout>("wrapLayoutWithExamples");
+    
     examples.set("action-bar", "action-bar/main-page");
+    
     examples.set("bindings", "bindings/main-page");
+    examples.set("button","button/main-page");
+
     examples.set("css", "css/main-page");
-    examples.set("fonts", "font/main-page");
-    examples.set("image-view", "image-view/main-page");
-    examples.set("tab-view", "tab-view/main-page");
-    examples.set("layouts", "layouts/main-page");
+
+    examples.set("dialogs", "dialogs/dialogs");
+    
     examples.set("events", "events/main-page");
-    examples.set("webview", "web-view/main-page");
+    
+    examples.set("fonts", "font/main-page");
     examples.set("flexbox", "flexbox/flexbox-main-page");
+    examples.set("htmlview", "html-view/html-view");    
+
+    examples.set("image-view", "image-view/main-page");
+    examples.set("issues", "issues/main-page");
+
+    examples.set("layouts", "layouts/main-page");
+    examples.set("list-picker", "list-picker/main-page");
+    examples.set("list-view", "list-view/main-page");
 
     examples.set("modalview", "modal-view/modal-view");
-    examples.set("dialogs", "dialogs/dialogs");
-    examples.set("htmlview", "html-view/html-view");
-    examples.set("timePicker", "time-picker/time-picker");
-    examples.set("segStyle", "segmented-bar/all");
-    examples.set("list-view", "list-view/main-page");
-    examples.set("issues", "issues/main-page");
+
     examples.set("page", "page/main-page");
-
-    examples.set("perf", "perf/main-page");
-    examples.set("list-picker", "list-picker/main-page");
-
-    examples.set("listview_binding", "pages/listview_binding");
-    examples.set("textfield", "text-field/main-page");
-    examples.set("button","button/main-page");
     examples.set("perf","perf/main-page");
 
+    examples.set("segStyle", "segmented-bar/all");
+
+    examples.set("tab-view", "tab-view/main-page");
+    examples.set("timePicker", "time-picker/time-picker");
+    examples.set("text-field", "text-field/main-page");
+
+    examples.set("webview", "web-view/main-page");
+
     let viewModel = new MainPageViewModel(wrapLayout, examples);
     page.bindingContext = viewModel;
 
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 90cc9a83a..dba68a897 100644
--- a/apps/app/ui-tests-app/text-field/main-page.ts
+++ b/apps/app/ui-tests-app/text-field/main-page.ts
@@ -11,6 +11,7 @@ export function pageLoaded(args: EventData) {
 
     let examples: Map<string, string> = new Map<string, string>();
     examples.set("secured-text-field", "text-field/secured-text-field-4135");
+    examples.set("max-length", "text-field/max-length");
 
     let viewModel = new SubMainPageViewModel(wrapLayout, examples);
     page.bindingContext = viewModel;
diff --git a/apps/app/ui-tests-app/text-field/max-length.ts b/apps/app/ui-tests-app/text-field/max-length.ts
new file mode 100644
index 000000000..5c89ef4be
--- /dev/null
+++ b/apps/app/ui-tests-app/text-field/max-length.ts
@@ -0,0 +1,30 @@
+import { Page } from "tns-core-modules/ui/page";
+import { TextField } from "tns-core-modules/ui/text-field";
+
+export function setText(args) {
+    let page = args;
+    
+    if (page.constructor.name !== "Page") {
+        page = args.object.page;
+        setTextFieldText(page, "inXml", "in xml");
+    }
+
+    setTextFieldText(page, "maxLenghtFromCodeBehindWithText", "from code behind");
+    setTextFieldText(page, "useInput", "");
+    setTextFieldText(page, "maxLenghtFromCodeBehind", "");
+}
+
+export function pageLoaded(args) {
+    const page = args.object;
+    setText(page);
+}
+
+function setTextFieldText(page: Page, name: string, text: string) {
+    const textField = <TextField>page.getViewById(name);
+    
+    if (name === "maxLenghtFromCodeBehind" || name === "maxLenghtFromCodeBehindWithText") {
+        textField.maxLength = 3;
+    }
+
+    textField.text = text;
+}
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/text-field/max-length.xml b/apps/app/ui-tests-app/text-field/max-length.xml
new file mode 100644
index 000000000..7fc095bbc
--- /dev/null
+++ b/apps/app/ui-tests-app/text-field/max-length.xml
@@ -0,0 +1,14 @@
+<Page loaded="pageLoaded">
+    <Page.actionBar>
+        <ActionBar title="maxLength" />
+    </Page.actionBar>
+    <StackLayout>
+        <TextField id="maxLenghtFromCodeBehindWithText" hint="max lenght and text from code behind" maxLength="3" />
+        <TextField id="maxLenghtFromCodeBehind" hint="set only max length from code behind" />
+        <TextField id="inXml" text="in xml" hint="in xml" maxLength="3" />
+        <TextField id="useInput" hint="user input" maxLength="3" />
+        <TextField id="useInput" hint="user input" maxLength="3" secure="true" />
+        
+        <Button tap="setText" text="Revert to initial state" />
+    </StackLayout>
+</Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/text-field/secured-text-field-4135.xml b/apps/app/ui-tests-app/text-field/secured-text-field-4135.xml
index c05e2d810..9c8dd6d57 100644
--- a/apps/app/ui-tests-app/text-field/secured-text-field-4135.xml
+++ b/apps/app/ui-tests-app/text-field/secured-text-field-4135.xml
@@ -3,7 +3,7 @@
         <Label text="hint" />
         <TextField secure="true" text="test" hint="hint"></TextField>
         <TextField secure="true" text="text"></TextField>
-        <TextField secure="true" hint="hint"></TextField>
+        <TextField secure="true" hint="hint" maxLength="3" ></TextField>
         <Label text="bindings" />
         <TextField id="textField" automationText="textField" text="{{ textProperty }}" />
         <TextField id="textFieldSecured" automationText="textFieldSecured" text="{{ textProperty }}" />