diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java
index c7ac98d413..920ce139cc 100644
--- a/application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java
@@ -15,25 +15,34 @@
  */
 package org.thingsboard.server.controller;
 
+import com.datastax.driver.core.utils.UUIDs;
+import com.fasterxml.jackson.core.type.TypeReference;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.thingsboard.server.common.data.Device;
-import org.thingsboard.server.common.data.EntityView;
-import org.thingsboard.server.common.data.Tenant;
-import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.*;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.objects.AttributesEntityView;
 import org.thingsboard.server.common.data.objects.TelemetryEntityView;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
 import org.thingsboard.server.common.data.security.Authority;
+import org.thingsboard.server.dao.model.ModelConstants;
 
-import java.util.Arrays;
+import java.util.*;
+import java.util.stream.Stream;
 
+import static org.hamcrest.Matchers.containsString;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
 import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
 
 public abstract class BaseEntityViewControllerTest extends AbstractControllerTest {
 
+    private IdComparator<EntityView> idComparator;
     private Tenant savedTenant;
     private User tenantAdmin;
     private Device testDevice;
@@ -43,6 +52,8 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes
     public void beforeTest() throws Exception {
         loginSysAdmin();
 
+        idComparator = new IdComparator<>();
+
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
         savedTenant = doPost("/api/tenant", tenant, Tenant.class);
@@ -62,13 +73,14 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes
         device.setName("Test device");
         device.setType("default");
         testDevice = doPost("/api/device", device, Device.class);
-
         obj = new TelemetryEntityView(
                 Arrays.asList("109L", "209L"),
                 new AttributesEntityView(
-                        Arrays.asList("caKey1", "caKey2", "caKey3"),
-                        Arrays.asList("saKey1", "saKey2", "saKey3", "saKey4"),
-                        Arrays.asList("shKey1", "shKey2", "shKey3", "shKey4", "shKey5")));
+                        Arrays.asList("caKey1", "caKey2"),
+                        Arrays.asList("saKey1", "saKey2", "saKey3"),
+                        Arrays.asList("shKey1", "shKey2", "shKey3", "shKey4")
+                )
+        );
     }
 
     @After
@@ -81,24 +93,15 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes
 
     @Test
     public void testFindEntityViewById() throws Exception {
-        EntityView view = new EntityView();
-        view.setName("Test entity view");
-        view.setEntityId(testDevice.getId());
-        view.setKeys(new TelemetryEntityView(obj));
-        EntityView savedView = doPost("/api/entity-view", view, EntityView.class);
+        EntityView savedView = doPost("/api/entity-view", getNewEntityView("Test entity view"), EntityView.class);
         EntityView foundView = doGet("/api/entity-view/" + savedView.getId().getId().toString(), EntityView.class);
         Assert.assertNotNull(foundView);
         Assert.assertEquals(savedView, foundView);
     }
 
     @Test
-    public void testSaveEntityViewWithIdOfDevice() throws Exception {
-        EntityView view = new EntityView();
-        view.setEntityId(testDevice.getId());
-        view.setName("Test entity view");
-        view.setTenantId(savedTenant.getId());
-        view.setKeys(new TelemetryEntityView(obj));
-        EntityView savedView = doPost("/api/entity-view", view, EntityView.class);
+    public void testSaveEntityView() throws Exception {
+        EntityView savedView = doPost("/api/entity-view", getNewEntityView("Test entity view"), EntityView.class);
 
         Assert.assertNotNull(savedView);
         Assert.assertNotNull(savedView.getId());
@@ -110,25 +113,235 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes
 
         savedView.setName("New test entity view");
         doPost("/api/entity-view", savedView, EntityView.class);
-
-        EntityView foundEntityView = doGet("/api/entity-view/"
-                + savedView.getId().getId().toString(), EntityView.class);
+        EntityView foundEntityView = doGet("/api/entity-view/" + savedView.getId().getId().toString(), EntityView.class);
 
         Assert.assertEquals(foundEntityView.getName(), savedView.getName());
     }
 
     @Test
     public void testDeleteEntityView() throws Exception {
-        EntityView view = new EntityView();
-        view.setName("Test entity view");
-        view.setEntityId(testDevice.getId());
-        view.setKeys(new TelemetryEntityView((TelemetryEntityView) obj));
-        EntityView savedView = doPost("/api/entity-view", view, EntityView.class);
-
+        EntityView savedView = doPost("/api/entity-view", getNewEntityView("Test entity view"), EntityView.class);
         doDelete("/api/entity-view/" + savedView.getId().getId().toString())
                 .andExpect(status().isOk());
-
         doGet("/api/entity-view/" + savedView.getId().getId().toString())
                 .andExpect(status().isNotFound());
     }
+
+    @Test
+    public void testSaveEntityViewWithEmptyName() throws Exception {
+        doPost("/api/entity-view", getNewEntityView("Entity view"))
+                .andExpect(status().isBadRequest())
+                .andExpect(statusReason(containsString("Entity-view name should be specified")));
+    }
+
+    @Test
+    public void testAssignAndUnAssignedEntityViewToCustomer() throws Exception {
+        EntityView savedView = doPost("/api/entity-view", getNewEntityView("Test entity view"), EntityView.class);
+        Customer savedCustomer = doPost("/api/customer", getNewCustomer("My customer"), Customer.class);
+        EntityView assignedView = doPost("/api/customer/" + savedCustomer.getId().getId().toString()
+                + "/entity-view/" + savedView.getId().getId().toString(), EntityView.class);
+        Assert.assertEquals(savedCustomer.getId(), assignedView.getCustomerId());
+
+        EntityView foundView = doGet("/api/entity-view" + savedView.getId().getId().toString(), EntityView.class);
+        Assert.assertEquals(savedCustomer.getId(), foundView.getCustomerId());
+
+        EntityView unAssignedView = doDelete("/api/customer/entity-view/" + savedView.getId().getId().toString(), EntityView.class);
+        Assert.assertEquals(ModelConstants.NULL_UUID, unAssignedView.getCustomerId().getId());
+
+        foundView = doGet("/api/entity-view/" + savedView.getId().getId().toString(), EntityView.class);
+        Assert.assertEquals(ModelConstants.NULL_UUID, foundView.getCustomerId().getId());
+    }
+
+    @Test
+    public void testAssignEntityViewToNonExistentCustomer() throws Exception {
+        EntityView savedView = doPost("/api/entity-view", getNewEntityView("Test entity view"), EntityView.class);
+        doPost("/api/customer/" + UUIDs.timeBased().toString() + "/device/" + savedView.getId().getId().toString())
+                .andExpect(status().isNotFound());
+    }
+
+    @Test
+    public void testAssignEntityViewToCustomerFromDifferentTenant() throws Exception {
+        loginSysAdmin();
+
+        Tenant savedAnotherTenant = doPost("/api/tenant", getNewTenant("Different tenant"), Tenant.class);
+        Assert.assertNotNull(savedAnotherTenant);
+
+        User adminAnotherTenant = new User();
+        adminAnotherTenant.setAuthority(Authority.TENANT_ADMIN);
+        adminAnotherTenant.setTenantId(savedAnotherTenant.getId());
+        adminAnotherTenant.setEmail("tenant3@thingsboard.org");
+        adminAnotherTenant.setFirstName("Joe");
+        adminAnotherTenant.setLastName("Downs");
+        createUserAndLogin(adminAnotherTenant, "testPassword1");
+
+        Customer savedCustomer = doPost("/api/customer", getNewCustomer("Different customer"), Customer.class);
+        login(tenantAdmin.getEmail(), "testPassword1");
+
+        EntityView savedView = doPost("/api/entity-view", getNewEntityView("Test entity view"), EntityView.class);
+        doPost("/api/customer/" + savedCustomer.getId().getId().toString() + "/entity-view/" + savedView.getId().getId().toString())
+                .andExpect(status().isForbidden());
+
+        loginSysAdmin();
+
+        doDelete("/api/tenant/" + savedAnotherTenant.getId().getId().toString())
+                .andExpect(status().isOk());
+    }
+
+    @Test
+    public void testGetCustomerEntityViews() throws Exception {
+        CustomerId customerId = doPost("/api/customer", getNewCustomer("Test customer"), Customer.class).getId();
+        String urlTemplate = "/api/customer/" + customerId.getId().toString() + "/entity-views?";
+
+        List<EntityView> views = new ArrayList<>();
+        for (int i = 0; i < 128; i++) {
+            views.add(doPost("/api/customer/" + customerId.getId().toString() + "/entity-view/"
+                    + getNewEntityView("Test entity view " + i).getId().getId().toString(), EntityView.class));
+        }
+
+        List<EntityView> loadedViews = loadListOf(new TextPageLink(23), urlTemplate);
+
+        Collections.sort(views, idComparator);
+        Collections.sort(loadedViews, idComparator);
+
+        Assert.assertEquals(views, loadedViews);
+    }
+
+    @Test
+    public void testGetCustomerEntityViewsByName() throws Exception {
+        CustomerId customerId = doPost("/api/customer", getNewCustomer("Test customer"), Customer.class).getId();
+        String urlTemplate = "/api/customer/" + customerId.getId().toString() + "/entity-views?";
+
+        String name1 = "Entity view name1";
+        List<EntityView> namesOfView1 = fillListOf(125, name1, "/api/customer/" + customerId.getId().toString()
+                + "/entity-view/");
+        List<EntityView> loadedNamesOfView1 = loadListOf(new TextPageLink(15, name1), urlTemplate);
+        Collections.sort(namesOfView1, idComparator);
+        Collections.sort(loadedNamesOfView1, idComparator);
+        Assert.assertEquals(namesOfView1, loadedNamesOfView1);
+
+        String name2 = "Entity view name2";
+        List<EntityView> NamesOfView2 = fillListOf(143, name2, "/api/customer/" + customerId.getId().toString()
+                + "/entity-view/");
+        List<EntityView> loadedNamesOfView2 = loadListOf(new TextPageLink(4, name2), urlTemplate);
+        Collections.sort(NamesOfView2, idComparator);
+        Collections.sort(loadedNamesOfView2, idComparator);
+        Assert.assertEquals(NamesOfView2, loadedNamesOfView2);
+
+        for (EntityView view : loadedNamesOfView1) {
+            doDelete("/api/customer/entity-view/" + view.getId().getId().toString()).andExpect(status().isOk());
+        }
+        TextPageData<EntityView> pageData = doGetTypedWithPageLink(urlTemplate,
+                    new TypeReference<TextPageData<EntityView>>(){}, new TextPageLink(4, name1));
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertEquals(0, pageData.getData().size());
+
+        for (EntityView view : loadedNamesOfView2) {
+            doDelete("/api/customer/entity-view/" + view.getId().getId().toString()).andExpect(status().isOk());
+        }
+        pageData = doGetTypedWithPageLink(urlTemplate, new TypeReference<TextPageData<EntityView>>(){},
+                new TextPageLink(4, name2));
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertEquals(0, pageData.getData().size());
+    }
+
+    @Test
+    public void testGetTenantEntityViews() throws Exception {
+
+        List<EntityView> views = new ArrayList<>();
+        for (int i = 0; i < 178; i++) {
+            views.add(doPost("/api/entity-view/", getNewEntityView("Test entity view" + i), EntityView.class));
+        }
+        List<EntityView> loadedViews = loadListOf(new TextPageLink(23), "/api/tenant/entity-views?");
+
+        Collections.sort(views, idComparator);
+        Collections.sort(loadedViews, idComparator);
+
+        Assert.assertEquals(views, loadedViews);
+    }
+
+    @Test
+    public void testGetTenantEntityViewsByName() throws Exception {
+        String name1 = "Entity view name1";
+        List<EntityView> namesOfView1 = fillListOf(143, name1);
+        List<EntityView> loadedNamesOfView1 = loadListOf(new TextPageLink(15, name1), "/api/tenant/entity-views?");
+        Collections.sort(namesOfView1, idComparator);
+        Collections.sort(loadedNamesOfView1, idComparator);
+        Assert.assertEquals(namesOfView1, loadedNamesOfView1);
+
+        String name2 = "Entity view name2";
+        List<EntityView> NamesOfView2 = fillListOf(75, name2);
+        List<EntityView> loadedNamesOfView2 = loadListOf(new TextPageLink(4, name2), "/api/tenant/entity-views?");
+        Collections.sort(NamesOfView2, idComparator);
+        Collections.sort(loadedNamesOfView2, idComparator);
+        Assert.assertEquals(NamesOfView2, loadedNamesOfView2);
+
+        for (EntityView view : loadedNamesOfView1) {
+            doDelete("/api/entity-view/" + view.getId().getId().toString()).andExpect(status().isOk());
+        }
+        TextPageData<EntityView> pageData = doGetTypedWithPageLink("/api/tenant/entity-views?",
+                new TypeReference<TextPageData<EntityView>>(){}, new TextPageLink(4, name1));
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertEquals(0, pageData.getData().size());
+
+        for (EntityView view : loadedNamesOfView2) {
+            doDelete("/api/entity-view/" + view.getId().getId().toString()).andExpect(status().isOk());
+        }
+        pageData = doGetTypedWithPageLink("/api/tenant/entity-views?", new TypeReference<TextPageData<EntityView>>(){},
+                new TextPageLink(4, name2));
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertEquals(0, pageData.getData().size());
+    }
+
+    private EntityView getNewEntityView(String name) throws Exception {
+        EntityView view = new EntityView();
+        view.setName(name);
+        view.setEntityId(testDevice.getId());
+        view.setTenantId(savedTenant.getId());
+        view.setKeys(new TelemetryEntityView(obj));
+        return doPost("/api/entity-view", view, EntityView.class);
+    }
+
+    private Customer getNewCustomer(String title) {
+        Customer customer = new Customer();
+        customer.setTitle(title);
+        return customer;
+    }
+
+    private Tenant getNewTenant(String title) {
+        Tenant tenant = new Tenant();
+        tenant.setTitle(title);
+        return tenant;
+    }
+
+    private List<EntityView> fillListOf(int limit, String partOfName, String urlTemplate) throws Exception {
+        List<EntityView> views = new ArrayList<>();
+        for (EntityView view : fillListOf(limit, partOfName)) {
+            views.add(doPost(urlTemplate + view.getId().getId().toString(), EntityView.class));
+        }
+        return views;
+    }
+
+    private List<EntityView> fillListOf(int limit, String partOfName) throws Exception {
+        List<EntityView> viewNames = new ArrayList<>();
+        for (int i = 0; i < limit; i++) {
+            String fullName = partOfName + ' ' + RandomStringUtils.randomAlphanumeric(15);
+            fullName = i % 2 == 0 ? fullName.toLowerCase() : fullName.toUpperCase();
+            viewNames.add(doPost("/api/entity-view", getNewEntityView(fullName), EntityView.class));
+        }
+        return viewNames;
+    }
+
+    private List<EntityView> loadListOf(TextPageLink pageLink, String urlTemplate) throws Exception {
+        List<EntityView> loadedItems = new ArrayList<>();
+        TextPageData<EntityView> pageData;
+        do {
+            pageData = doGetTypedWithPageLink(urlTemplate, new TypeReference<TextPageData<EntityView>>(){}, pageLink);
+            loadedItems.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+
+        return loadedItems;
+    }
 }