diff --git a/packages/frontend/.eslintrc b/packages/frontend/.eslintrc
index e8619af6..401df73c 100644
--- a/packages/frontend/.eslintrc
+++ b/packages/frontend/.eslintrc
@@ -29,7 +29,7 @@
   },
   "rules": {
     "semi" : [2, "never"],
-    "max-len": [2, 120, 2],
+    "max-len": [2, { "code": 120, "tabWidth": 2, "ignoreTemplateLiterals": true }],
     "generator-star-spacing": 0,
     "babel/generator-star-spacing": 1,
     "jsx-quotes": [2, "prefer-single"]
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index 963a6c1c..0584653f 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -9,10 +9,9 @@
   },
   "scripts": {
     "clean": "rimraf dist",
+    "lint": "eslint src",
     "build": "better-npm-run build",
     "build:dev": "better-npm-run build:dev",
-    "lint": "eslint src tests server",
-    "lint:fix": "npm run lint -- --fix",
     "start": "npm run start:admin",
     "start:admin": "better-npm-run start admin",
     "start:status": "better-npm-run start status",
@@ -20,8 +19,7 @@
     "test:dev": "npm run test -- --watch",
     "deploy": "better-npm-run deploy",
     "release": "better-npm-run release",
-    "release:force": "npm run release -- --force",
-    "codecov": "cat coverage/*/lcov.info | codecov"
+    "release:force": "npm run release -- --force"
   },
   "betterScripts": {
     "build": {
diff --git a/packages/frontend/src/components/CloudWatchMetricsSelector/CloudWatchMetricsSelector.js b/packages/frontend/src/components/CloudWatchMetricsSelector/CloudWatchMetricsSelector.js
index ecf9b4a6..54082e24 100644
--- a/packages/frontend/src/components/CloudWatchMetricsSelector/CloudWatchMetricsSelector.js
+++ b/packages/frontend/src/components/CloudWatchMetricsSelector/CloudWatchMetricsSelector.js
@@ -1,5 +1,4 @@
 import React, { PropTypes } from 'react'
-import classnames from 'classnames'
 import DropdownList from 'components/DropdownList'
 import classes from './CloudWatchMetricsSelector.scss'
 
diff --git a/packages/frontend/src/components/ComponentDialog/ComponentDialog.js b/packages/frontend/src/components/ComponentDialog/ComponentDialog.js
index 2ba2f192..34139337 100644
--- a/packages/frontend/src/components/ComponentDialog/ComponentDialog.js
+++ b/packages/frontend/src/components/ComponentDialog/ComponentDialog.js
@@ -118,7 +118,8 @@ class ComponentDialog extends React.Component {
       <div className='mdl-dialog__content'>
         <ErrorMessage message={this.state.message} />
         <TextField label='Name' text={this.state.name} rows={1} onChange={this.handleChangeName} />
-        <TextField label='Description (optional)' text={this.state.description} rows={2} onChange={this.handleChangeDescription} />
+        <TextField label='Description (optional)' text={this.state.description} rows={2}
+          onChange={this.handleChangeDescription} />
       </div>
       <div className='mdl-dialog__actions'>
         <Button onClick={clickHandler} name={actionName}
diff --git a/packages/frontend/src/components/Header/Header.js b/packages/frontend/src/components/Header/Header.js
index c0b16eaa..99afa1ce 100644
--- a/packages/frontend/src/components/Header/Header.js
+++ b/packages/frontend/src/components/Header/Header.js
@@ -23,7 +23,7 @@ export default class Header extends React.Component {
       <div>
         <button id='header-user-menu'
           className={classnames('mdl-button', 'mdl-js-button', classes.nav_item)}>
-           {this.props.username}
+          {this.props.username}
           <i className='material-icons'>keyboard_arrow_down</i>
         </button>
 
diff --git a/packages/frontend/src/components/IncidentDialog/IncidentDialog.js b/packages/frontend/src/components/IncidentDialog/IncidentDialog.js
index 1bc7c65b..9ba07abb 100644
--- a/packages/frontend/src/components/IncidentDialog/IncidentDialog.js
+++ b/packages/frontend/src/components/IncidentDialog/IncidentDialog.js
@@ -151,7 +151,8 @@ class IncidentDialog extends React.Component {
     const statusDOMs = incidentStatuses.map((status) => {
       let checked = status === this.state.incidentStatus
       return (
-        <RadioButton key={status} onChange={this.handleChangeIncidentStatus} label={status} checked={checked} groupName='status' />
+        <RadioButton key={status} onChange={this.handleChangeIncidentStatus} label={status}
+          checked={checked} groupName='status' />
       )
     })
     return (
diff --git a/packages/lambda/.eslintrc b/packages/lambda/.eslintrc
index ff57e2fe..76c809f2 100644
--- a/packages/lambda/.eslintrc
+++ b/packages/lambda/.eslintrc
@@ -18,7 +18,7 @@
   },
   "rules": {
     "semi" : [2, "never"],
-    "max-len": [2, 120, 2],
+    "max-len": [2, { "code": 120, "tabWidth": 2, "ignoreTemplateLiterals": true }],
     "generator-star-spacing": 0,
     "babel/generator-star-spacing": 1,
     "jsx-quotes": [2, "prefer-single"]
diff --git a/wercker.yml b/wercker.yml
index 57ae6da5..0069be4c 100644
--- a/wercker.yml
+++ b/wercker.yml
@@ -9,10 +9,20 @@ build:
     - npm-install:
         cwd: packages/frontend
     - script:
-      name: test lambda package
-      cwd: packages/lambda
-      code: |
-        npm run test
+        name: lint lambda package
+        cwd: packages/lambda
+        code: |
+          npm run lint
+    - script:
+        name: lint frontend package
+        cwd: packages/frontend
+        code: |
+          npm run lint
+    - script:
+        name: test lambda package
+        cwd: packages/lambda
+        code: |
+          npm run test
     - script:
         name: test frontend package
         cwd: packages/frontend