diff --git a/packages/unleash-api/lib/routes/metrics.js b/packages/unleash-api/lib/routes/metrics.js
index 6573540422..0650c10169 100644
--- a/packages/unleash-api/lib/routes/metrics.js
+++ b/packages/unleash-api/lib/routes/metrics.js
@@ -17,7 +17,6 @@ module.exports = function (app, config) {
     });
 
     app.post('/metrics', (req, res) => {
-        
         // TODO: validate input and reply with http errorcode
         try {
             // not required with header: Content-Type: application/json
diff --git a/packages/unleash-api/test/e2e/test-helper.js b/packages/unleash-api/test/e2e/test-helper.js
index 9d83c78e12..bd09d50113 100644
--- a/packages/unleash-api/test/e2e/test-helper.js
+++ b/packages/unleash-api/test/e2e/test-helper.js
@@ -11,6 +11,8 @@ const EventStore = require('../../lib/event-store');
 const eventStore = new EventStore(eventDb);
 const featureDb = require('../../lib/db/feature')(knex, eventStore);
 const strategyDb = require('../../lib/db/strategy')(knex, eventStore);
+const metricsDb = require('../../lib/db/metrics')(knex);
+
 
 const app = require('../../app')({
     baseUriPath: '',
@@ -19,6 +21,7 @@ const app = require('../../app')({
     eventStore,
     featureDb,
     strategyDb,
+    metricsDb,
 });
 
 BPromise.promisifyAll(request);
diff --git a/packages/unleash-frontend-next/src/.eslintrc b/packages/unleash-frontend-next/src/.eslintrc
index d6429d7b45..67c2bde374 100644
--- a/packages/unleash-frontend-next/src/.eslintrc
+++ b/packages/unleash-frontend-next/src/.eslintrc
@@ -18,5 +18,8 @@
             "spread":true,
             "restParams": true
         }
+    },
+    "rules": {
+        "no-shadow": 0
     }
 }
diff --git a/packages/unleash-frontend-next/src/component/archive/archive-container.js b/packages/unleash-frontend-next/src/component/archive/archive-container.js
index cfa005c5d7..a7b589e5d7 100644
--- a/packages/unleash-frontend-next/src/component/archive/archive-container.js
+++ b/packages/unleash-frontend-next/src/component/archive/archive-container.js
@@ -3,7 +3,7 @@ import ListComponent from './archive-list-component';
 import { fetchArchive, revive } from '../../store/archive-actions';
 
 const mapStateToProps = (state) => {
-    const archive = state.archive.get('list').toArray(); // eslint-disable-line no-shadow
+    const archive = state.archive.get('list').toArray();
 
     return {
         archive,
diff --git a/packages/unleash-frontend-next/src/component/archive/archive-list-component.jsx b/packages/unleash-frontend-next/src/component/archive/archive-list-component.jsx
index 989912f9f5..5dcd783ba5 100644
--- a/packages/unleash-frontend-next/src/component/archive/archive-list-component.jsx
+++ b/packages/unleash-frontend-next/src/component/archive/archive-list-component.jsx
@@ -5,7 +5,7 @@ import Chip from 'react-toolbox/lib/chip';
 import Switch from 'react-toolbox/lib/switch';
 
 const ArchivedFeature = ({ feature, revive }) => {
-    const { name, description, enabled, strategies } = feature; // eslint-disable-line no-shadow
+    const { name, description, enabled, strategies } = feature;
     const actions = [
         <div>{strategies && strategies.map(s => <Chip><small>{s.name}</small></Chip>)}</div>,
         <FontIcon style={{ cursor: 'pointer' }} value="restore" onClick={() => revive(feature)} />,
diff --git a/packages/unleash-frontend-next/src/component/feature/feature-component.jsx b/packages/unleash-frontend-next/src/component/feature/feature-component.jsx
index 619282c935..6513a922b3 100644
--- a/packages/unleash-frontend-next/src/component/feature/feature-component.jsx
+++ b/packages/unleash-frontend-next/src/component/feature/feature-component.jsx
@@ -9,7 +9,7 @@ import Chip from 'react-toolbox/lib/chip';
 import style from './feature.scss';
 
 const Feature = ({ feature, onFeatureClick, onFeatureRemove }) => {
-    const { name, description, enabled, strategies } = feature; // eslint-disable-line no-shadow
+    const { name, description, enabled, strategies } = feature;
 
     const actions = [
         <div key="strategies">{strategies && strategies.map((s, i) => <Chip key={i}><small>{s.name}</small></Chip>)}</div>,
diff --git a/packages/unleash-frontend-next/src/component/history/history-container.js b/packages/unleash-frontend-next/src/component/history/history-container.js
index 957dc063b3..6986b6d3d5 100644
--- a/packages/unleash-frontend-next/src/component/history/history-container.js
+++ b/packages/unleash-frontend-next/src/component/history/history-container.js
@@ -3,7 +3,7 @@ import ListComponent from './history-list-component';
 import { fetchHistory } from '../../store/history-actions';
 
 const mapStateToProps = (state) => {
-    const history = state.history.get('list').toArray(); // eslint-disable-line no-shadow
+    const history = state.history.get('list').toArray();
 
     return {
         history,
diff --git a/packages/unleash-frontend-next/src/component/history/history-list-component.jsx b/packages/unleash-frontend-next/src/component/history/history-list-component.jsx
index 74148fd35b..9fff000308 100644
--- a/packages/unleash-frontend-next/src/component/history/history-list-component.jsx
+++ b/packages/unleash-frontend-next/src/component/history/history-list-component.jsx
@@ -27,7 +27,7 @@ class HistoryList extends Component {
     }
 
     render () {
-        const { history } = this.props; // eslint-disable-line no-shadow
+        const { history } = this.props;
 
         return (
             <List ripple >