diff --git a/frontend_tests/casper_tests/05-subscriptions.js b/frontend_tests/casper_tests/05-subscriptions.js
index 48434ec75b..b00c6b2953 100644
--- a/frontend_tests/casper_tests/05-subscriptions.js
+++ b/frontend_tests/casper_tests/05-subscriptions.js
@@ -134,22 +134,28 @@ casper.then(function () {
     casper.fill('form#stream_creation_form', {stream_name: '  '});
     casper.click('form#stream_creation_form button.btn.btn-primary');
 });
-casper.waitForText('A stream needs to have a name', function () {
-    casper.test.assertTextExists('A stream needs to have a name', "Can't create a stream with an empty name");
-    casper.click('form#stream_creation_form button.btn.btn-default');
-    casper.fill('form#add_new_subscription', {stream_name: '  '});
-    casper.click('#create_stream_button');
-    casper.fill('form#stream_creation_form', {stream_name: 'Waseemio'});
-    casper.click('form#stream_creation_form button.btn.btn-primary');
+casper.then(function () {
+    casper.waitForSelectorText('#stream_name_error', 'A stream needs to have a name', function () {
+        casper.test.assertTextExists('A stream needs to have a name', "Can't create a stream with an empty name");
+        casper.click('form#stream_creation_form button.btn.btn-default');
+        casper.fill('form#add_new_subscription', {stream_name: '  '});
+        casper.click('#create_stream_button');
+        casper.fill('form#stream_creation_form', {stream_name: 'Waseemio'});
+        casper.click('form#stream_creation_form button.btn.btn-primary');
+    });
 });
-casper.waitForText('A stream with this name already exists', function () {
-    casper.test.assertTextExists('A stream with this name already exists', "Can't create a stream with a duplicate name");
-    casper.test.info('Streams should be filtered when typing in the create box');
-    casper.click('form#stream_creation_form button.btn.btn-default');
+casper.then(function () {
+    casper.waitForSelectorText('#stream_name_error', 'A stream with this name already exists', function () {
+        casper.test.assertTextExists('A stream with this name already exists', "Can't create a stream with a duplicate name");
+        casper.test.info('Streams should be filtered when typing in the create box');
+        casper.click('form#stream_creation_form button.btn.btn-default');
+    });
 });
-casper.waitForText('Filter streams', function () {
-    casper.test.assertSelectorHasText('.stream-row[data-stream-name="Verona"] .stream-name', 'Verona', 'Verona stream exists before filtering');
-    casper.test.assertSelectorDoesntHaveText('.stream-row.notdisplayed .stream-name', 'Verona', 'Verona stream shown before filtering');
+casper.then(function () {
+    casper.waitForSelectorText('#search_stream_name', '', function () {
+        casper.test.assertSelectorHasText('.stream-row[data-stream-name="Verona"] .stream-name', 'Verona', 'Verona stream exists before filtering');
+        casper.test.assertSelectorDoesntHaveText('.stream-row.notdisplayed .stream-name', 'Verona', 'Verona stream shown before filtering');
+    });
 });
 casper.then(function () {
     casper.fill('form#add_new_subscription', {stream_name: 'was'});