diff --git a/awx/ui/test/e2e/commands/findThenClick.js b/awx/ui/test/e2e/commands/findThenClick.js
index 82dc2b62f9..fd8581623e 100644
--- a/awx/ui/test/e2e/commands/findThenClick.js
+++ b/awx/ui/test/e2e/commands/findThenClick.js
@@ -1,7 +1,11 @@
+const spinny = "//*[contains(@class, 'spinny')]";
+
 exports.command = function findThenClick (selector) {
     this.waitForElementPresent(selector, () => {
         this.moveToElement(selector, 0, 0, () => {
-            this.click(selector);
+            this.click(selector, () => {
+                this.waitForElementNotVisible(spinny);
+            });
         });
     });
     return this;
diff --git a/awx/ui/test/e2e/fixtures.js b/awx/ui/test/e2e/fixtures.js
index f88ced43bb..56c012fb28 100644
--- a/awx/ui/test/e2e/fixtures.js
+++ b/awx/ui/test/e2e/fixtures.js
@@ -309,6 +309,18 @@ const getUser = (namespace = session) => getOrganization(namespace)
         password: AWX_E2E_PASSWORD
     }, ['username']));
 
+const getUserExact = (namespace = session, name) => getOrganization(namespace)
+    .then(organization => getOrCreate(`/organizations/${organization.id}/users/`, {
+        username: `${name}`,
+        organization: organization.id,
+        first_name: 'firstname',
+        last_name: 'lastname',
+        email: 'null@ansible.com',
+        is_superuser: false,
+        is_system_auditor: false,
+        password: AWX_E2E_PASSWORD
+    }, ['username']));
+
 const getJobTemplateAdmin = (namespace = session) => {
     const rolePromise = getJobTemplate(namespace)
         .then(obj => obj.summary_fields.object_roles.admin_role);
@@ -392,5 +404,6 @@ module.exports = {
     getTeam,
     getUpdatedProject,
     getUser,
+    getUserExact,
     getWorkflowTemplate,
 };
diff --git a/awx/ui/test/e2e/tests/test-org-permissions.js b/awx/ui/test/e2e/tests/test-org-permissions.js
new file mode 100644
index 0000000000..4db48e8b23
--- /dev/null
+++ b/awx/ui/test/e2e/tests/test-org-permissions.js
@@ -0,0 +1,139 @@
+import {
+    getOrganization,
+    getUserExact,
+    getTeam,
+} from '../fixtures';
+
+let data;
+const spinny = "//*[contains(@class, 'spinny')]";
+const checkbox = '//input[@type="checkbox"]';
+
+const searchBar = "//input[contains(@class, 'SmartSearch-input')]";
+const modalSearchBar = '//*[@ui-view="modal"]//*[contains(@class, "SmartSearch-input")]';
+const teamSearchBar = '//*[@django-model="teams"]//input';
+const userRoleSearchBar = '//li//input[contains(@type, "search")]';
+const modalOrgsSearchBar = '//smart-search[@django-model="organizations"]//input';
+
+const orgsNavTab = "//at-side-nav-item[contains(@name, 'ORGANIZATIONS')]";
+const teamsNavTab = "//at-side-nav-item[contains(@name, 'TEAMS')]";
+const usersNavTab = "//at-side-nav-item[contains(@name, 'USERS')]";
+
+const orgTab = '//div[not(@ng-show="showSection2Container()")]/div[@class="Form-tabHolder"]/div[@ng-click="selectTab(\'organizations\')"]';
+const teamsTab = '//*[@id="teams_tab"]';
+const permissionsTab = '//*[@id="permissions_tab"]';
+const usersTab = '//*[@id="users_tab"]';
+
+const orgsText = 'name.iexact:"test-actions-organization"';
+const orgsCheckbox = '//select-list-item[@item="organization"]//input[@type="checkbox"]';
+const orgDetails = '//*[contains(@class, "OrgCards-label")]';
+const orgRoleSelector = '//*[contains(@aria-labelledby, "select2-organizations")]';
+const readRole = '//*[contains(@id, "organizations-role") and text()="Read"]';
+
+const memberRoleText = 'member';
+const readRoleText = 'read';
+
+const teamsSelector = "//a[contains(text(), 'test-actions-team')]";
+const teamsText = 'name.iexact:"test-actions-team"';
+const teamsSearchBadgeCount = '//span[contains(@class, "List-titleBadge") and contains(text(), "1")]';
+const teamCheckbox = '//*[@item="team"]//input[@type="checkbox"]';
+const addUserToTeam = '//*[@aw-tool-tip="Add User"]';
+const userText = 'username.iexact:"test-actions-user"';
+
+const trashButton = '//i[contains(@class, "fa-trash")]';
+const deleteButton = '//*[text()="DELETE"]';
+const saveButton = '//*[text()="Save"]';
+
+const addPermission = '//*[@aw-tool-tip="Grant Permission"]';
+const addTeamPermission = '//*[@aw-tool-tip="Add a permission"]';
+const verifyTeamPermissions = '//*[contains(@class, "List-tableRow")]//*[text()="Read"]';
+const readOrgPermissionResults = '//*[@id="permissions_table"]//*[text()="test-actions-organization"]/parent::*/parent::*//*[contains(text(), "Read")]';
+
+module.exports = {
+    before: (client, done) => {
+        const resources = [
+            getUserExact('test-actions', 'test-actions-user'),
+            getOrganization('test-actions'),
+            getTeam('test-actions'),
+        ];
+
+        Promise.all(resources)
+            .then(([user, org, team]) => {
+                data = { user, org, team };
+                done();
+            });
+        client
+            .login()
+            .waitForAngular()
+            .resizeWindow(1200, 1000)
+            .useXpath()
+            .findThenClick(teamsNavTab)
+            .clearValue(searchBar)
+            .setValue(searchBar, [teamsText, client.Keys.ENTER])
+            .waitForElementNotVisible(spinny)
+            .waitForElementVisible(teamsSearchBadgeCount)
+            .findThenClick(teamsSelector);
+    },
+    'test orgs permissions tab in teams view': client => {
+        client
+            .useXpath()
+            .findThenClick(permissionsTab)
+            .findThenClick(addPermission)
+            .findThenClick(orgTab)
+            .clearValue(modalOrgsSearchBar)
+            .setValue(modalOrgsSearchBar, [orgsText, client.Keys.ENTER])
+            .waitForElementNotVisible(spinny)
+            .findThenClick(orgsCheckbox)
+            .findThenClick(orgRoleSelector)
+            .findThenClick(readRole)
+            .findThenClick(saveButton)
+            .clearValue(searchBar)
+            .setValue(searchBar, [orgsText, client.Keys.ENTER])
+            .waitForElementNotVisible(spinny)
+            .waitForElementPresent(readOrgPermissionResults);
+    },
+    'test adding team permissions in orgs view': client => {
+        // add user to team, then add team-wide permissions to org
+        client
+            .useXpath()
+            .findThenClick(usersTab)
+            .findThenClick(addUserToTeam)
+            .clearValue(modalSearchBar)
+            .setValue(modalSearchBar, [userText, client.Keys.ENTER])
+            .waitForElementNotVisible(spinny)
+            .findThenClick(checkbox)
+            .findThenClick(userRoleSearchBar)
+            .setValue(userRoleSearchBar, [memberRoleText, client.Keys.ENTER])
+            .waitForElementNotVisible(spinny)
+            .findThenClick(saveButton)
+            // add team-wide permissions to an organization
+            .findThenClick(orgsNavTab)
+            .clearValue(searchBar)
+            .setValue(searchBar, [orgsText, client.Keys.ENTER])
+            .waitForElementNotVisible(spinny)
+            .findThenClick(orgDetails)
+            .pause(3000) // overlay is in the way sometimes, not spinny
+            .findThenClick(permissionsTab)
+            .findThenClick(addTeamPermission)
+            .findThenClick(teamsTab)
+            .clearValue(teamSearchBar)
+            .setValue(teamSearchBar, [teamsText, client.Keys.ENTER])
+            .waitForElementNotVisible(spinny)
+            .findThenClick(teamCheckbox)
+            .findThenClick(userRoleSearchBar)
+            .setValue(userRoleSearchBar, [readRoleText, client.Keys.ENTER])
+            .waitForElementNotVisible(spinny)
+            .findThenClick(saveButton)
+            .clearValue(searchBar)
+            .setValue(searchBar, [userText, client.Keys.ENTER])
+            .waitForElementVisible(verifyTeamPermissions);
+    },
+    after: client => {
+        client
+            .findThenClick(usersNavTab)
+            .setValue(searchBar, [userText, client.Keys.ENTER])
+            .waitForElementNotVisible(spinny)
+            .findThenClick(trashButton)
+            .findThenClick(deleteButton)
+            .end();
+    }
+};