diff --git a/test/api/InputHandler.api.ts b/test/api/InputHandler.api.ts
index 2070dfe6..4bc2c07d 100644
--- a/test/api/InputHandler.api.ts
+++ b/test/api/InputHandler.api.ts
@@ -6,6 +6,7 @@
 import * as puppeteer from 'puppeteer';
 import { assert } from 'chai';
 import { ITerminalOptions } from 'xterm';
+import { pollFor } from './TestUtils';
 
 const APP = 'http://127.0.0.1:3000/test';
 
@@ -15,8 +16,6 @@ const width = 800;
 const height = 600;
 
 describe('InputHandler Integration Tests', function(): void {
-  this.timeout(20000);
-
   before(async function(): Promise<any> {
     browser = await puppeteer.launch({
       headless: process.argv.indexOf('--headless') !== -1,
@@ -45,7 +44,7 @@ describe('InputHandler Integration Tests', function(): void {
         // Explicit
         window.term.write('bar\\x1b[3D\\x1b[4@')
       `);
-      assert.deepEqual(await getLinesAsArray(2), [' foo', '    bar']);
+      await pollFor(page, () => getLinesAsArray(2), [' foo', '    bar']);
     });
 
     it('CUU: Cursor Up Ps Times (default = 1) - CSI Ps A', async function(): Promise<any> {
@@ -55,7 +54,7 @@ describe('InputHandler Integration Tests', function(): void {
         // Explicit
         window.term.write('\x1b[2Ab')
       `);
-      assert.deepEqual(await getLinesAsArray(4), ['', ' b', '', 'a']);
+      await pollFor(page, () => getLinesAsArray(4), ['', ' b', '', 'a']);
     });
 
     it('CUD: Cursor Down Ps Times (default = 1) - CSI Ps B', async function(): Promise<any> {
@@ -65,7 +64,7 @@ describe('InputHandler Integration Tests', function(): void {
         // Explicit
         window.term.write('\x1b[2Bb')
       `);
-      assert.deepEqual(await getLinesAsArray(4), ['', 'a', '', ' b']);
+      await pollFor(page, () => getLinesAsArray(4), ['', 'a', '', ' b']);
     });
 
     it('CUF: Cursor Forward Ps Times (default = 1) - CSI Ps C', async function(): Promise<any> {
@@ -75,7 +74,7 @@ describe('InputHandler Integration Tests', function(): void {
         // Explicit
         window.term.write('\x1b[2Cb')
       `);
-      assert.deepEqual(await getLinesAsArray(1), [' a  b']);
+      await pollFor(page, () => getLinesAsArray(1), [' a  b']);
     });
 
     it('CUB: Cursor Backward Ps Times (default = 1) - CSI Ps D', async function(): Promise<any> {
@@ -85,7 +84,7 @@ describe('InputHandler Integration Tests', function(): void {
         // Explicit
         window.term.write('\x1b[2Db')
       `);
-      assert.deepEqual(await getLinesAsArray(1), ['fba']);
+      await pollFor(page, () => getLinesAsArray(1), ['fba']);
     });
 
     it('CNL: Cursor Next Line Ps Times (default = 1) - CSI Ps E', async function(): Promise<any> {
@@ -95,7 +94,7 @@ describe('InputHandler Integration Tests', function(): void {
         // Explicit
         window.term.write('\x1b[2Eb')
       `);
-      assert.deepEqual(await getLinesAsArray(4), ['', 'a', '', 'b']);
+      await pollFor(page, () => getLinesAsArray(4), ['', 'a', '', 'b']);
     });
 
     it('CPL: Cursor Preceding Line Ps Times (default = 1) - CSI Ps F', async function(): Promise<any> {
@@ -105,7 +104,7 @@ describe('InputHandler Integration Tests', function(): void {
         // Explicit
         window.term.write('\x1b[2Fb')
       `);
-      assert.deepEqual(await getLinesAsArray(5), ['', 'b', '', 'a', '']);
+      await pollFor(page, () => getLinesAsArray(5), ['', 'b', '', 'a', '']);
     });
 
     it('CHA: Cursor Character Absolute [column] (default = [row,1]) - CSI Ps G', async function(): Promise<any> {
@@ -115,7 +114,7 @@ describe('InputHandler Integration Tests', function(): void {
         // Explicit
         window.term.write('\x1b[10Gb')
       `);
-      assert.deepEqual(await getLinesAsArray(1), ['aoo      b']);
+      await pollFor(page, () => getLinesAsArray(1), ['aoo      b']);
     });
 
     it('CUP: Cursor Position [row;column] (default = [1,1]) - CSI Ps ; Ps H', async function(): Promise<any> {
@@ -125,7 +124,7 @@ describe('InputHandler Integration Tests', function(): void {
         // Explicit
         window.term.write('\x1b[3;3Hb')
       `);
-      assert.deepEqual(await getLinesAsArray(3), ['aoo', '', '  b']);
+      await pollFor(page, () => getLinesAsArray(3), ['aoo', '', '  b']);
     });
 
     it('CHT: Cursor Forward Tabulation Ps tab stops (default = 1) - CSI Ps I', async function(): Promise<any> {
@@ -135,7 +134,7 @@ describe('InputHandler Integration Tests', function(): void {
         // Explicit
         window.term.write('\\n\\r\x1b[2Ib')
       `);
-      assert.deepEqual(await getLinesAsArray(2), ['        a', '                b']);
+      await pollFor(page, () => getLinesAsArray(2), ['        a', '                b']);
     });
 
     it('ED: Erase in Display, VT100 - CSI Ps J', async function(): Promise<any> {
@@ -145,26 +144,26 @@ describe('InputHandler Integration Tests', function(): void {
         window.term.resize(5, 5);
         window.term.write('${fixture}\x1b[J')
       `);
-      assert.deepEqual(await getLinesAsArray(3), ['abc', 'd', '']);
+      await pollFor(page, () => getLinesAsArray(3), ['abc', 'd', '']);
       await page.evaluate(`
         // 0: Erase Below
         window.term.reset()
         window.term.write('${fixture}\x1b[0J')
       `);
-      assert.deepEqual(await getLinesAsArray(3), ['abc', 'd', '']);
+      await pollFor(page, () => getLinesAsArray(3), ['abc', 'd', '']);
       await page.evaluate(`
         // 1: Erase Above
         window.term.reset()
         window.term.write('${fixture}\x1b[1J')
       `);
-      assert.deepEqual(await getLinesAsArray(3), ['', '  f', 'ghi']);
+      await pollFor(page, () => getLinesAsArray(3), ['', '  f', 'ghi']);
       await page.evaluate(`
         // 2: Erase Saved Lines (scrollback)
         window.term.reset()
         window.term.write('1\\n2\\n3\\n4\\n5${fixture}\x1b[3J')
       `);
-      assert.equal(await page.evaluate(`window.term.buffer.length`), 5);
-      assert.deepEqual(await getLinesAsArray(5), ['   4', '    5', 'abc', 'def', 'ghi']);
+      await pollFor(page, () => page.evaluate(`window.term.buffer.length`), 5);
+      await pollFor(page, () => getLinesAsArray(5), ['   4', '    5', 'abc', 'def', 'ghi']);
     });
 
     it('DECSED: Erase in Display, VT220 - CSI ? Ps J', async function(): Promise<any> {
@@ -174,26 +173,26 @@ describe('InputHandler Integration Tests', function(): void {
         window.term.resize(5, 5);
         window.term.write('${fixture}\x1b[?J')
       `);
-      assert.deepEqual(await getLinesAsArray(3), ['abc', 'd', '']);
+      await pollFor(page, () => getLinesAsArray(3), ['abc', 'd', '']);
       await page.evaluate(`
         // 0: Erase Below
         window.term.reset()
         window.term.write('${fixture}\x1b[?0J')
       `);
-      assert.deepEqual(await getLinesAsArray(3), ['abc', 'd', '']);
+      await pollFor(page, () => getLinesAsArray(3), ['abc', 'd', '']);
       await page.evaluate(`
         // 1: Erase Above
         window.term.reset()
         window.term.write('${fixture}\x1b[?1J')
       `);
-      assert.deepEqual(await getLinesAsArray(3), ['', '  f', 'ghi']);
+      await pollFor(page, () => getLinesAsArray(3), ['', '  f', 'ghi']);
       await page.evaluate(`
         // 2: Erase Saved Lines (scrollback)
         window.term.reset()
         window.term.write('1\\n2\\n3\\n4\\n5${fixture}\x1b[?3J')
       `);
-      assert.equal(await page.evaluate(`window.term.buffer.length`), 5);
-      assert.deepEqual(await getLinesAsArray(5), ['   4', '    5', 'abc', 'def', 'ghi']);
+      await pollFor(page, () => page.evaluate(`window.term.buffer.length`), 5);
+      await pollFor(page, () => getLinesAsArray(5), ['   4', '    5', 'abc', 'def', 'ghi']);
     });
 
     it('IL: Insert Ps Line(s) (default = 1) - CSI Ps L', async function(): Promise<any> {
@@ -203,7 +202,7 @@ describe('InputHandler Integration Tests', function(): void {
         // Explicit
         window.term.write('\x1b[2Lb')
       `);
-      assert.deepEqual(await getLinesAsArray(4), ['b', '', 'a', 'foo']);
+      await pollFor(page, () => getLinesAsArray(4), ['b', '', 'a', 'foo']);
     });
 
     it('DL: Delete Ps Line(s) (default = 1) - CSI Ps M', async function(): Promise<any> {
@@ -213,7 +212,7 @@ describe('InputHandler Integration Tests', function(): void {
         // Explicit
         window.term.write('\x1b[1Ed\\ne\\nf\x1b[2F\x1b[2M')
       `);
-      assert.deepEqual(await getLinesAsArray(5), [' b', '  f', '', '', '']);
+      await pollFor(page, () => getLinesAsArray(5), [' b', '  f', '', '', '']);
     });
 
     it('DCH: Delete Ps Character(s) (default = 1) - CSI Ps P', async function(): Promise<any> {
@@ -223,7 +222,7 @@ describe('InputHandler Integration Tests', function(): void {
         // Explicit
         window.term.write('\\n\\rdef\x1b[2;1H\x1b[2P')
       `);
-      assert.deepEqual(await getLinesAsArray(2), ['bc', 'f']);
+      await pollFor(page, () => getLinesAsArray(2), ['bc', 'f']);
     });
 
     describe('DSR: Device Status Report', () => {
@@ -232,31 +231,31 @@ describe('InputHandler Integration Tests', function(): void {
           window.term.onData(e => window.result = e);
           window.term.write('\\x1b[5n');
         `);
-        assert.equal(await page.evaluate(`window.result`), '\x1b[0n');
+        await pollFor(page, () => page.evaluate(`window.result`), '\x1b[0n');
       });
 
       it('Report Cursor Position (CPR) - CSI 6 n', async function(): Promise<any> {
         await page.evaluate(`window.term.write('\\n\\nfoo')`);
-        assert.deepEqual(await page.evaluate(`
+        await pollFor(page, () => page.evaluate(`
           [window.term.buffer.cursorY, window.term.buffer.cursorX]
         `), [2, 3]);
         await page.evaluate(`
           window.term.onData(e => window.result = e);
           window.term.write('\\x1b[6n');
         `);
-        assert.equal(await page.evaluate(`window.result`), '\x1b[3;4R');
+        await pollFor(page, () => page.evaluate(`window.result`), '\x1b[3;4R');
       });
 
       it('Report Cursor Position (DECXCPR) - CSI ? 6 n', async function(): Promise<any> {
         await page.evaluate(`window.term.write('\\n\\nfoo')`);
-        assert.deepEqual(await page.evaluate(`
+        await pollFor(page, () => page.evaluate(`
           [window.term.buffer.cursorY, window.term.buffer.cursorX]
         `), [2, 3]);
         await page.evaluate(`
           window.term.onData(e => window.result = e);
           window.term.write('\\x1b[?6n');
         `);
-        assert.equal(await page.evaluate(`window.result`), '\x1b[?3;4R');
+        await pollFor(page, () => page.evaluate(`window.result`), '\x1b[?3;4R');
       });
     });
 
@@ -277,22 +276,23 @@ describe('InputHandler Integration Tests', function(): void {
           await page.mouse.up();
           // Clear selection
           await page.mouse.click((coords.left + coords.right) / 2, (coords.top + coords.bottom) / 2);
-          assert.equal(await page.evaluate(`window.term.getSelection().length`), 0);
+          await pollFor(page, () => page.evaluate(`window.term.getSelection().length`), 0);
           // Enable mouse events
           await page.evaluate(`window.term.write('\x1b[?1003h')`);
           // Click and drag and ensure there is no selection
           await page.mouse.click((coords.left + coords.right) / 2, (coords.top + coords.bottom) / 2);
           await page.mouse.down();
           await page.mouse.move((coords.left + coords.right) / 2, (coords.top + coords.bottom) / 4);
-          assert.equal(await page.evaluate(`window.term.getSelection().length`), 0, 'mouse events are on so there should be no selection');
+          // mouse events are on so there should be no selection
+          await pollFor(page, () => page.evaluate(`window.term.getSelection().length`), 0);
           await page.mouse.up();
         });
         it('Pm = 2004, Set bracketed paste mode', async function(): Promise<any> {
-          assert.equal(await simulatePaste('foo'), 'foo');
+          await pollFor(page, () => simulatePaste('foo'), 'foo');
           await page.evaluate(`window.term.write('\x1b[?2004h')`);
-          assert.equal(await simulatePaste('bar'), '\x1b[200~bar\x1b[201~');
+          await pollFor(page, () => simulatePaste('bar'), '\x1b[200~bar\x1b[201~');
           await page.evaluate(`window.term.write('\x1b[?2004l')`);
-          assert.equal(await simulatePaste('baz'), 'baz');
+          await pollFor(page, () => simulatePaste('baz'), 'baz');
         });
       });
     });
@@ -309,32 +309,32 @@ describe('InputHandler Integration Tests', function(): void {
         window.term.writeln('');
         window.term.write('#\x1b[5b');
       `);
-      assert.deepEqual(await getLinesAsArray(4), ['##', '##', '##', '######']);
-      assert.deepEqual(await getCursor(), {col: 6, row: 3});
+      await pollFor(page, () => getLinesAsArray(4), ['##', '##', '##', '######']);
+      await pollFor(page, () => getCursor(), {col: 6, row: 3});
       // should not repeat on fullwidth chars
       await page.evaluate(`
         window.term.reset();
         window.term.write('￥\x1b[10b');
       `);
-      assert.deepEqual(await getLinesAsArray(1), ['￥']);
+      await pollFor(page, () => getLinesAsArray(1), ['￥']);
       // should repeat only base char of combining
       await page.evaluate(`
         window.term.reset();
         window.term.write('e\u0301\x1b[5b');
       `);
-      assert.deepEqual(await getLinesAsArray(1), ['e\u0301eeeee']);
+      await pollFor(page, () => getLinesAsArray(1), ['e\u0301eeeee']);
       // should wrap correctly
       await page.evaluate(`
         window.term.reset();
         window.term.write('#\x1b[15b');
       `);
-      assert.deepEqual(await getLinesAsArray(2), ['##########', '######']);
+      await pollFor(page, () => getLinesAsArray(2), ['##########', '######']);
       await page.evaluate(`
         window.term.reset();
         window.term.write('\x1b[?7l');  // disable wrap around
         window.term.write('#\x1b[15b');
       `);
-      assert.deepEqual(await getLinesAsArray(2), ['##########', '']);
+      await pollFor(page, () => getLinesAsArray(2), ['##########', '']);
       // any successful sequence should reset REP
       await page.evaluate(`
         window.term.reset();
@@ -344,7 +344,7 @@ describe('InputHandler Integration Tests', function(): void {
         window.term.writeln('');
         window.term.write('abcdefg\x1b[3D\x1b[10b#\x1b[3b');
       `);
-      assert.deepEqual(await getLinesAsArray(3), ['#', ' #', 'abcd####']);
+      await pollFor(page, () => getLinesAsArray(3), ['#', ' #', 'abcd####']);
     });
   });
 
@@ -360,7 +360,7 @@ describe('InputHandler Integration Tests', function(): void {
           window.term.resize(10, 4);
           window.term.write('\\x1b[?47l\\x1b8');
         `);
-        assert.deepEqual(await getCursor(), {col: 1, row: 3});
+        await pollFor(page, () => getCursor(), {col: 1, row: 3});
       });
     });
   });