diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index f3bb01f40..000000000
--- a/.eslintignore
+++ /dev/null
@@ -1,2 +0,0 @@
-**/parser/*.js
-src/d3.js
diff --git a/package.json b/package.json
index 5aa547258..9ba4be6d1 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,13 @@
   },
   "author": "Knut Sveidqvist",
   "license": "MIT",
+  "standard": {
+    "ignore": [
+      "**/parser/*.js",
+      "src/d3.js",
+      "dist/*.js"
+    ]
+  },
   "dependencies": {
     "chalk": "^1.1.3",
     "d3": "3.5.6",
diff --git a/src/diagrams/classDiagram/classDiagram.spec.js b/src/diagrams/classDiagram/classDiagram.spec.js
index aed7c656d..d05a9e581 100644
--- a/src/diagrams/classDiagram/classDiagram.spec.js
+++ b/src/diagrams/classDiagram/classDiagram.spec.js
@@ -1,3 +1,4 @@
+/* eslint-env jasmine */
 /**
  * Created by knut on 14-11-18.
  */
diff --git a/src/diagrams/classDiagram/classRenderer.spec.js b/src/diagrams/classDiagram/classRenderer.spec.js
index 0b617b885..b3a5a5721 100644
--- a/src/diagrams/classDiagram/classRenderer.spec.js
+++ b/src/diagrams/classDiagram/classRenderer.spec.js
@@ -1,3 +1,4 @@
+/* eslint-env jasmine */
 // var proxyquire = require('proxyquire');
 // var newD3;
 /// **
diff --git a/src/diagrams/example/example.spec.js b/src/diagrams/example/example.spec.js
index 5c615204b..9c133b5c4 100644
--- a/src/diagrams/example/example.spec.js
+++ b/src/diagrams/example/example.spec.js
@@ -1,3 +1,4 @@
+/* eslint-env jasmine */
 /**
  * Created by knut on 14-11-18.
  */
diff --git a/src/diagrams/gantt/gantt.spec.js b/src/diagrams/gantt/gantt.spec.js
index 1a5cb8cda..342ac0397 100644
--- a/src/diagrams/gantt/gantt.spec.js
+++ b/src/diagrams/gantt/gantt.spec.js
@@ -1,3 +1,4 @@
+/* eslint-env jasmine */
 /**
  * Created by knut on 14-11-18.
  */
diff --git a/src/diagrams/gantt/ganttDb.spec.js b/src/diagrams/gantt/ganttDb.spec.js
index b64d7cfb8..6e975a601 100644
--- a/src/diagrams/gantt/ganttDb.spec.js
+++ b/src/diagrams/gantt/ganttDb.spec.js
@@ -1,3 +1,4 @@
+/* eslint-env jasmine */
 /**
  * Created by knut on 14-11-18.
  */
diff --git a/src/diagrams/gitGraph/gitGraphParser.spec.js b/src/diagrams/gitGraph/gitGraphParser.spec.js
index dee5aec90..d0c1c7952 100644
--- a/src/diagrams/gitGraph/gitGraphParser.spec.js
+++ b/src/diagrams/gitGraph/gitGraphParser.spec.js
@@ -1,3 +1,4 @@
+/* eslint-env jasmine */
 var parser = require('./parser/gitGraph').parser
 var ast = require('./gitGraphAst.js')
 describe('when parsing a gitGraph', function () {
diff --git a/src/diagrams/sequenceDiagram/sequenceDiagram.spec.js b/src/diagrams/sequenceDiagram/sequenceDiagram.spec.js
index 6cd1a55d5..a0a29db8e 100644
--- a/src/diagrams/sequenceDiagram/sequenceDiagram.spec.js
+++ b/src/diagrams/sequenceDiagram/sequenceDiagram.spec.js
@@ -1,3 +1,4 @@
+/* eslint-env jasmine */
 var proxyquire = require('proxyquire')
 /**
  * Created by knut on 14-11-18.
diff --git a/src/mermaid.spec.js b/src/mermaid.spec.js
index f61308b19..9f001e394 100644
--- a/src/mermaid.spec.js
+++ b/src/mermaid.spec.js
@@ -1,3 +1,4 @@
+/* eslint-env jasmine */
 /**
  * Created by knut on 14-11-26.
  */
diff --git a/src/mermaidAPI.spec.js b/src/mermaidAPI.spec.js
index ce6d5c210..674bc45be 100644
--- a/src/mermaidAPI.spec.js
+++ b/src/mermaidAPI.spec.js
@@ -1,3 +1,4 @@
+/* eslint-env jasmine */
 /**
  * Created by knut on 14-11-26.
  */
diff --git a/src/utils.spec.js b/src/utils.spec.js
index 491d0c414..7a2b0de9b 100644
--- a/src/utils.spec.js
+++ b/src/utils.spec.js
@@ -1,3 +1,4 @@
+/* eslint-env jasmine */
 /**
  * Created by knut on 14-11-23.
  */
diff --git a/test/nav.js b/test/nav.js
index 513327cc3..eb69fc094 100644
--- a/test/nav.js
+++ b/test/nav.js
@@ -1,7 +1,7 @@
 /**
  * Created by knut on 2015-09-15.
  */
-var navApp = angular.module('navApp', [])
+var navApp = window.angular.module('navApp', [])
 
 navApp.controller('NavAppCtrl', function ($scope) {
   $scope.items = [
@@ -14,6 +14,6 @@ navApp.controller('NavAppCtrl', function ($scope) {
   $scope.frameUrl = 'web.html'
 
   $scope.go = function (url) {
-    alert(url)
+    window.alert(url)
   }
 })
diff --git a/test/usageTests/browserifyUsage.js b/test/usageTests/browserifyUsage.js
index 97ae07747..9ac47c12b 100644
--- a/test/usageTests/browserifyUsage.js
+++ b/test/usageTests/browserifyUsage.js
@@ -1,6 +1,6 @@
 /**
  * Created by knut on 14-12-02.
  */
-mermaid = require('mermaid')
+const mermaid = require('mermaid')
 
 console.log('Test page! mermaid version' + mermaid.version())
diff --git a/test/usageTests/reqJsApp.js b/test/usageTests/reqJsApp.js
index 1933f7142..250de92dd 100644
--- a/test/usageTests/reqJsApp.js
+++ b/test/usageTests/reqJsApp.js
@@ -1,3 +1,4 @@
+/* eslint-env qunit */
 require.config({
   paths: {
     mermaid: '../../dist/mermaid'
diff --git a/test/usageTests/simple.js b/test/usageTests/simple.js
index f06c615b4..3690d47e1 100644
--- a/test/usageTests/simple.js
+++ b/test/usageTests/simple.js
@@ -1,9 +1,9 @@
 /**
  * Created by knut on 15-03-07.
  */
-define('simple', function () {
-  var simple = {
-    data: 'info'
-  }
-  return simple
-})
+// define('simple', function () {
+//   var simple = {
+//     data: 'info'
+//   }
+//   return simple
+// })