diff --git a/app/views/DirectoryView/index.js b/app/views/DirectoryView/index.js
index afb1214f38..f78e74a21f 100644
--- a/app/views/DirectoryView/index.js
+++ b/app/views/DirectoryView/index.js
@@ -165,12 +165,12 @@ class DirectoryView extends React.Component {
 				<SearchBox
 					onChangeText={this.onSearchChangeText}
 					onSubmitEditing={this.search}
-					testID='federation-view-search'
+					testID='directory-view-search'
 				/>
 				<Touch
 					onPress={this.toggleDropdown}
 					style={styles.dropdownItemButton}
-					testID='federation-view-create-channel'
+					testID='directory-view-dropdown'
 					theme={theme}
 				>
 					<View style={[sharedStyles.separatorVertical, styles.toggleDropdownContainer, { borderColor: themes[theme].separatorColor }]}>
@@ -199,7 +199,7 @@ class DirectoryView extends React.Component {
 			title: item.name,
 			onPress: () => this.onPressItem(item),
 			baseUrl,
-			testID: `federation-view-item-${ item.name }`,
+			testID: `directory-view-item-${ item.name }`.toLowerCase(),
 			style,
 			user,
 			theme,
diff --git a/e2e/tests/assorted/09-joinfromdirectory.spec.js b/e2e/tests/assorted/09-joinfromdirectory.spec.js
new file mode 100644
index 0000000000..308c4db2c8
--- /dev/null
+++ b/e2e/tests/assorted/09-joinfromdirectory.spec.js
@@ -0,0 +1,47 @@
+const {
+	device, expect, element, by, waitFor
+} = require('detox');
+const data = require('../../data');
+const { navigateToLogin, login, tapBack, sleep } = require('../../helpers/app');
+
+const testuser = data.users.regular
+
+async function navigateToRoom(search) {
+	await element(by.id('directory-view-search')).replaceText(search);	
+	await waitFor(element(by.id(`directory-view-item-${ search }`))).toBeVisible().withTimeout(10000);
+	await sleep(300); // app takes some time to animate
+	await element(by.id(`directory-view-item-${ search }`)).tap();
+	await waitFor(element(by.id('room-view'))).toExist().withTimeout(5000);
+	await waitFor(element(by.id(`room-view-title-${ search }`))).toExist().withTimeout(5000);
+}
+
+describe('Join room from directory', () => {
+	before(async() => {
+		await device.launchApp({ permissions: { notifications: 'YES' }, delete: true });
+		await navigateToLogin();
+		await login(testuser.username, testuser.password);
+	});
+
+	describe('Usage', async() => {
+		it('should tap directory', async() => {
+			await element(by.id('rooms-list-view-directory')).tap();	
+			await waitFor(element(by.id('directory-view'))).toExist().withTimeout(2000);
+		})
+
+		it('should search public channel and navigate', async() => {
+			await navigateToRoom(data.channels.detoxpublic.name);
+		})
+
+		it('should back and tap directory', async() => {
+			await tapBack();
+			await element(by.id('rooms-list-view-directory')).tap();	
+		})
+
+		it('should search user and navigate', async() => {
+			await element(by.id('directory-view-dropdown')).tap();	
+			await element(by.label('Users')).tap();
+			await element(by.label('Search by')).tap();	
+			await navigateToRoom(data.users.alternate.username);
+		})
+	});
+});