diff --git a/e2e/components/block-scroll-strategy/block-scroll-strategy.e2e.ts b/e2e/components/block-scroll-strategy-e2e.spec.ts
similarity index 97%
rename from e2e/components/block-scroll-strategy/block-scroll-strategy.e2e.ts
rename to e2e/components/block-scroll-strategy-e2e.spec.ts
index 75aaa672495..008bb714a24 100644
--- a/e2e/components/block-scroll-strategy/block-scroll-strategy.e2e.ts
+++ b/e2e/components/block-scroll-strategy-e2e.spec.ts
@@ -1,6 +1,6 @@
 import {browser, Key, element, by} from 'protractor';
-import {screenshot} from '../../screenshot';
-import {getScrollPosition} from '../../util/index';
+import {screenshot} from '../screenshot';
+import {getScrollPosition} from '../util/index';
 
 
 describe('scroll blocking', () => {
diff --git a/e2e/components/button/button.e2e.ts b/e2e/components/button-e2e.spec.ts
similarity index 95%
rename from e2e/components/button/button.e2e.ts
rename to e2e/components/button-e2e.spec.ts
index dc8f76e212e..db275e50595 100644
--- a/e2e/components/button/button.e2e.ts
+++ b/e2e/components/button-e2e.spec.ts
@@ -1,5 +1,5 @@
 import {browser, by, element, ExpectedConditions} from 'protractor';
-import {screenshot} from '../../screenshot';
+import {screenshot} from '../screenshot';
 
 
 describe('button', () => {
diff --git a/e2e/components/checkbox/checkbox.e2e.ts b/e2e/components/checkbox-e2e.spec.ts
similarity index 97%
rename from e2e/components/checkbox/checkbox.e2e.ts
rename to e2e/components/checkbox-e2e.spec.ts
index 0238dd2c1b5..c42c1abbacc 100644
--- a/e2e/components/checkbox/checkbox.e2e.ts
+++ b/e2e/components/checkbox-e2e.spec.ts
@@ -1,5 +1,5 @@
 import {browser, by, element, Key, ExpectedConditions} from 'protractor';
-import {screenshot} from '../../screenshot';
+import {screenshot} from '../screenshot';
 
 
 describe('checkbox', () => {
diff --git a/e2e/components/dialog/dialog.e2e.ts b/e2e/components/dialog-e2e.spec.ts
similarity index 99%
rename from e2e/components/dialog/dialog.e2e.ts
rename to e2e/components/dialog-e2e.spec.ts
index 908c2e5ec36..571e057747f 100644
--- a/e2e/components/dialog/dialog.e2e.ts
+++ b/e2e/components/dialog-e2e.spec.ts
@@ -5,7 +5,7 @@ import {
   pressKeys,
   clickElementAtPoint,
   waitForElement,
-} from '../../util/index';
+} from '../util/index';
 
 
 describe('dialog', () => {
diff --git a/e2e/components/fullscreen/fullscreen.e2e.ts b/e2e/components/fullscreen-e2e.spec.ts
similarity index 100%
rename from e2e/components/fullscreen/fullscreen.e2e.ts
rename to e2e/components/fullscreen-e2e.spec.ts
diff --git a/e2e/components/grid-list/grid-list.e2e.ts b/e2e/components/grid-list-e2e.spec.ts
similarity index 79%
rename from e2e/components/grid-list/grid-list.e2e.ts
rename to e2e/components/grid-list-e2e.spec.ts
index a4937ac7d17..a70c8176c8e 100644
--- a/e2e/components/grid-list/grid-list.e2e.ts
+++ b/e2e/components/grid-list-e2e.spec.ts
@@ -1,6 +1,6 @@
 import {browser} from 'protractor';
-import {expectToExist} from '../../util/index';
-import {screenshot} from '../../screenshot';
+import {expectToExist} from '../util/index';
+import {screenshot} from '../screenshot';
 
 describe('grid-list', () => {
   beforeEach(() => browser.get('/grid-list'));
diff --git a/e2e/components/icon/icon.e2e.ts b/e2e/components/icon-e2e.spec.ts
similarity index 93%
rename from e2e/components/icon/icon.e2e.ts
rename to e2e/components/icon-e2e.spec.ts
index 872915d7d22..57fea20eabf 100644
--- a/e2e/components/icon/icon.e2e.ts
+++ b/e2e/components/icon-e2e.spec.ts
@@ -1,5 +1,5 @@
 import {browser, by, element} from 'protractor';
-import {screenshot} from '../../screenshot';
+import {screenshot} from '../screenshot';
 
 
 describe('icon', () => {
diff --git a/e2e/components/input/input.e2e.ts b/e2e/components/input-e2e.spec.ts
similarity index 100%
rename from e2e/components/input/input.e2e.ts
rename to e2e/components/input-e2e.spec.ts
diff --git a/e2e/components/list/list.e2e.ts b/e2e/components/list-e2e.spec.ts
similarity index 77%
rename from e2e/components/list/list.e2e.ts
rename to e2e/components/list-e2e.spec.ts
index 4d3675ee488..bdb541373d8 100644
--- a/e2e/components/list/list.e2e.ts
+++ b/e2e/components/list-e2e.spec.ts
@@ -1,6 +1,6 @@
 import {browser} from 'protractor';
-import {expectToExist} from '../../util/index';
-import {screenshot} from '../../screenshot';
+import {expectToExist} from '../util/index';
+import {screenshot} from '../screenshot';
 
 describe('list', () => {
   beforeEach(() => browser.get('/list'));
diff --git a/e2e/components/menu/menu.e2e.ts b/e2e/components/menu-e2e.spec.ts
similarity index 85%
rename from e2e/components/menu/menu.e2e.ts
rename to e2e/components/menu-e2e.spec.ts
index 8fd3ac0f403..98af13ad918 100644
--- a/e2e/components/menu/menu.e2e.ts
+++ b/e2e/components/menu-e2e.spec.ts
@@ -1,13 +1,12 @@
-import {Key, protractor} from 'protractor';
-import {MenuPage} from './menu-page';
-import {screenshot} from '../../screenshot';
+import {Key, protractor, browser, by, element, ElementFinder} from 'protractor';
+import {screenshot} from '../screenshot';
 import {
   expectToExist,
   expectAlignedWith,
   expectFocusOn,
   expectLocation,
   pressKeys,
-} from '../../util/index';
+} from '../util/index';
 
 
 describe('menu', () => {
@@ -192,3 +191,22 @@ describe('menu', () => {
 
   });
 });
+
+
+export class MenuPage {
+  constructor() { browser.get('/menu'); }
+  menu = () => element(by.css('.mat-menu-panel'));
+  start = () => element(by.id('start'));
+  trigger = () => element(by.id('trigger'));
+  triggerTwo = () => element(by.id('trigger-two'));
+  backdrop = () => element(by.css('.cdk-overlay-backdrop'));
+  items = (index: number) => element.all(by.css('[md-menu-item]')).get(index);
+  textArea = () => element(by.id('text'));
+  beforeTrigger = () => element(by.id('before-t'));
+  aboveTrigger = () => element(by.id('above-t'));
+  combinedTrigger = () => element(by.id('combined-t'));
+  beforeMenu = () => element(by.css('.mat-menu-panel.before'));
+  aboveMenu = () => element(by.css('.mat-menu-panel.above'));
+  combinedMenu = () => element(by.css('.mat-menu-panel.combined'));
+  getResultText = () => this.textArea().getText();
+}
diff --git a/e2e/components/menu/menu-page.ts b/e2e/components/menu/menu-page.ts
deleted file mode 100644
index 0d5dc6f8214..00000000000
--- a/e2e/components/menu/menu-page.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import {browser, by, element, ElementFinder} from 'protractor';
-
-export class MenuPage {
-  constructor() { browser.get('/menu'); }
-
-  menu(): ElementFinder { return element(by.css('.mat-menu-panel')); }
-
-  start(): ElementFinder { return element(by.id('start')); }
-
-  trigger(): ElementFinder { return element(by.id('trigger')); }
-
-  triggerTwo(): ElementFinder { return element(by.id('trigger-two')); }
-
-  backdrop(): ElementFinder { return element(by.css('.cdk-overlay-backdrop')); }
-
-  items(index: number): ElementFinder { return element.all(by.css('[md-menu-item]')).get(index); }
-
-  textArea(): ElementFinder { return element(by.id('text')); }
-
-  beforeTrigger(): ElementFinder { return element(by.id('before-t')); }
-
-  aboveTrigger(): ElementFinder { return element(by.id('above-t')); }
-
-  combinedTrigger(): ElementFinder { return element(by.id('combined-t')); }
-
-  beforeMenu(): ElementFinder { return element(by.css('.mat-menu-panel.before')); }
-
-  aboveMenu(): ElementFinder { return element(by.css('.mat-menu-panel.above')); }
-
-  combinedMenu(): ElementFinder { return element(by.css('.mat-menu-panel.combined')); }
-
-  getResultText() { return this.textArea().getText(); }
-}
diff --git a/e2e/components/progress-bar/progress-bar.e2e.ts b/e2e/components/progress-bar-e2e.spec.ts
similarity index 92%
rename from e2e/components/progress-bar/progress-bar.e2e.ts
rename to e2e/components/progress-bar-e2e.spec.ts
index 3c8b26787a0..aa62334f723 100644
--- a/e2e/components/progress-bar/progress-bar.e2e.ts
+++ b/e2e/components/progress-bar-e2e.spec.ts
@@ -1,5 +1,5 @@
 import {browser} from 'protractor';
-import {expectToExist} from '../../util/index';
+import {expectToExist} from '../util/index';
 
 describe('progress-bar', () => {
   beforeEach(() => browser.get('/progress-bar'));
diff --git a/e2e/components/progress-spinner/progress-spinner.e2e.ts b/e2e/components/progress-spinner-e2e.spec.ts
similarity index 100%
rename from e2e/components/progress-spinner/progress-spinner.e2e.ts
rename to e2e/components/progress-spinner-e2e.spec.ts
diff --git a/e2e/components/radio/radio.e2e.ts b/e2e/components/radio-e2e.spec.ts
similarity index 97%
rename from e2e/components/radio/radio.e2e.ts
rename to e2e/components/radio-e2e.spec.ts
index 445d6bcaefd..b248c0ff9a9 100644
--- a/e2e/components/radio/radio.e2e.ts
+++ b/e2e/components/radio-e2e.spec.ts
@@ -1,5 +1,5 @@
 import {browser, by, element, ExpectedConditions} from 'protractor';
-import {screenshot} from '../../screenshot';
+import {screenshot} from '../screenshot';
 
 
 describe('radio', () => {
diff --git a/e2e/components/slide-toggle/slide-toggle.e2e.ts b/e2e/components/slide-toggle-e2e.spec.ts
similarity index 96%
rename from e2e/components/slide-toggle/slide-toggle.e2e.ts
rename to e2e/components/slide-toggle-e2e.spec.ts
index 943db53912d..2780cb91a00 100644
--- a/e2e/components/slide-toggle/slide-toggle.e2e.ts
+++ b/e2e/components/slide-toggle-e2e.spec.ts
@@ -1,6 +1,6 @@
 import {browser, element, by, Key, ExpectedConditions} from 'protractor';
-import {expectToExist} from '../../util/index';
-import {screenshot} from '../../screenshot';
+import {expectToExist} from '../util/index';
+import {screenshot} from '../screenshot';
 
 
 describe('slide-toggle', () => {
diff --git a/e2e/components/tabs/tabs.e2e.ts b/e2e/components/tabs-e2e.spec.ts
similarity index 97%
rename from e2e/components/tabs/tabs.e2e.ts
rename to e2e/components/tabs-e2e.spec.ts
index 2e4dddc68ad..a0681a67c98 100644
--- a/e2e/components/tabs/tabs.e2e.ts
+++ b/e2e/components/tabs-e2e.spec.ts
@@ -7,8 +7,8 @@ import {
   Key,
   ExpectedConditions
 } from 'protractor';
-import {pressKeys} from '../../util/index';
-import {screenshot} from '../../screenshot';
+import {pressKeys} from '../util/index';
+import {screenshot} from '../screenshot';
 
 
 describe('tabs', () => {
diff --git a/e2e/index.e2e.ts b/e2e/index-e2e.spec.ts
similarity index 52%
rename from e2e/index.e2e.ts
rename to e2e/index-e2e.spec.ts
index 36b27f6bd96..f0fce6fd382 100644
--- a/e2e/index.e2e.ts
+++ b/e2e/index-e2e.spec.ts
@@ -1,9 +1,9 @@
 import {browser} from 'protractor';
 
-describe('hello, protractor', function () {
-  describe('index', function () {
+describe('hello, protractor', () => {
+  describe('index', () => {
     browser.get('/');
-    it('should have a title', function () {
+    it('should have a title', () => {
       expect(browser.getTitle()).toBe('Angular Material');
     });
   });
diff --git a/test/protractor.conf.js b/test/protractor.conf.js
index 7535b987c0e..83fa1471839 100644
--- a/test/protractor.conf.js
+++ b/test/protractor.conf.js
@@ -10,7 +10,7 @@ require('ts-node').register({
 const E2E_BASE_URL = process.env['E2E_BASE_URL'] || 'http://localhost:4200';
 const config = {
   useAllAngular2AppRoots: true,
-  specs: [ path.join(__dirname, '../e2e/**/*.e2e.ts') ],
+  specs: [ path.join(__dirname, '../e2e/**/*.spec.ts') ],
   baseUrl: E2E_BASE_URL,
   allScriptsTimeout: 120000,
   getPageTimeout: 120000,
@@ -42,14 +42,14 @@ if (process.env['TRAVIS']) {
   config.capabilities = {
     'browserName': 'chrome',
     'version': 'latest',
-    "chromedriverVersion": "2.28",
+    'chromedriverVersion': '2.28',
     'tunnel-identifier': process.env['TRAVIS_JOB_ID'],
     'build': process.env['TRAVIS_JOB_ID'],
     'name': 'Material E2E Tests',
 
     // Enables concurrent testing in the Webdriver. Currently runs five e2e files in parallel.
-    maxInstances: 5,
-    shardTestFiles: true,
+    'maxInstances': 5,
+    'shardTestFiles': true,
 
     // By default Saucelabs tries to record the whole e2e run. This can slow down the builds.
     'recordVideo': false,