diff --git a/test/app.js b/test/app.js
index f10bd11..5290fdf 100644
--- a/test/app.js
+++ b/test/app.js
@@ -75,11 +75,8 @@ describe('Darkwire', () => {
           browser.click('span#send-message-btn', done);
         });
 
-        it('should send message', () => {
-          browser.tabs.current = 0;
-          browser.wait('1s', () => {
-            browser.assert.text('.messageBody', /Hello world/);
-          });
+        it('should send message', (done) => {
+          helpers.zombie.waitFor(browser, '$(".messageBody").text() === "Hello world"', done);
         });
 
       });
diff --git a/test/helpers.js b/test/helpers.js
index e752691..017fb6f 100644
--- a/test/helpers.js
+++ b/test/helpers.js
@@ -44,6 +44,16 @@ var helpers = {
         return [1,2,3,4];
       }
     };
+  },
+  zombie: {
+    waitFor: (browser, str, cb) => {
+      let int = setInterval(() => {
+        if (browser.evaluate(str)) {
+          clearInterval(int);
+          cb();
+        }
+      }, 50);
+    }
   }
 };