diff --git a/.jshintrc b/.eslintrc
similarity index 57%
rename from .jshintrc
rename to .eslintrc
index 0238cdd0..6f5f801e 100644
--- a/.jshintrc
+++ b/.eslintrc
@@ -2,6 +2,7 @@
     "browser": true,
     "shadow": true,
     "globals": {
+        "jasmine": true,
         "describe": true,
         "beforeEach": true,
         "afterEach": true,
@@ -9,6 +10,12 @@
         "it": true,
         "xit": true,
         "expect": true,
-        "require": true
+        "require": true,
+        "global": true,
+        "__dirname": true,
+        "module": true
+    },
+    "rules": {
+        "quotes": "single"
     }
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index 33d46e06..b4dafba7 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "Reimplementation of CSS layout using pure JavaScript",
   "main": "src/Layout.js",
   "scripts": {
-    "pretest": "./node_modules/jshint/bin/jshint src",
+    "pretest": "./node_modules/eslint/bin/eslint.js src",
     "test": "./node_modules/karma/bin/karma start ./karma.conf.js --single-run"
   },
   "repository": {
@@ -18,8 +18,8 @@
   },
   "homepage": "https://github.com/facebook/css-layout",
   "devDependencies": {
+    "eslint": "^0.14.1",
     "jasmine-core": "^2.2.0",
-    "jshint": "^2.6.0",
     "karma": "^0.12.31",
     "karma-chrome-launcher": "^0.1.7",
     "karma-jasmine": "^0.3.5"
diff --git a/src/__tests__/Layout-random-test.js b/src/__tests__/Layout-random-test.js
index a0d2030c..d8cae15f 100644
--- a/src/__tests__/Layout-random-test.js
+++ b/src/__tests__/Layout-random-test.js
@@ -101,7 +101,6 @@ describe('Random layout', function() {
     delete node.style.flex;
     delete node.style.position;
 
-    /*jshint -W083 */
     it('should layout randomly #' + i +'.', function(node) {
       if (JSON.stringify(computeLayout(node)) !== JSON.stringify(computeDOMLayout(node))) {
         node = reduceTest(node);