diff --git a/.jshintignore b/.jshintignore
index 43f7cdb1..93e99231 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -1,5 +1,4 @@
 node_modules
-test
 src/main/javascript/doc.js
 dist
 lib
\ No newline at end of file
diff --git a/test/.jshintrc b/test/.jshintrc
new file mode 100644
index 00000000..33aabae9
--- /dev/null
+++ b/test/.jshintrc
@@ -0,0 +1,10 @@
+{
+  "extends": "../.jshintrc",
+  "expr": true,
+  "jasmine": true,
+  "globals": {
+    "before": false,
+    "after": false,
+    "expect": true
+  }
+}
\ No newline at end of file
diff --git a/test/e2e/driver.js b/test/e2e/driver.js
index 8a49ba89..0cc074af 100644
--- a/test/e2e/driver.js
+++ b/test/e2e/driver.js
@@ -1,6 +1,7 @@
 /*
  * Web driver manager
 */
+'use strict';
 
 var webdriver = require('selenium-webdriver');
 
diff --git a/test/e2e/servers.js b/test/e2e/servers.js
index c99a8c13..58cbb08e 100644
--- a/test/e2e/servers.js
+++ b/test/e2e/servers.js
@@ -1,6 +1,8 @@
 /*
  * Swagger UI and Specs Servers
 */
+'use strict';
+
 var path = require('path');
 var createServer = require('http-server').createServer;
 
diff --git a/test/e2e/v1.js b/test/e2e/v1.js
index fe194517..b3953737 100644
--- a/test/e2e/v1.js
+++ b/test/e2e/v1.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var expect = require('chai').expect;
 var driver = require('./driver');
 var servers = require('./servers');
@@ -13,7 +15,7 @@ var elements = [
   'header'
 ];
 
-describe('swagger 1.x spec tests', function (done) {
+describe('swagger 1.x spec tests', function () {
   this.timeout(10 * 1000);
 
   before(function (done) {
@@ -27,8 +29,9 @@ describe('swagger 1.x spec tests', function (done) {
         var errors = [];
         browserLogs.forEach(function(log){
           // 900 and above is "error" level. Console should not have any errors
-          if (log.level.value > 900)
+          if (log.level.value > 900) {
             console.log('browser error message:', log.message); errors.push(log);
+          }
         });
         expect(errors).to.be.empty;
         done();
@@ -46,7 +49,7 @@ describe('swagger 1.x spec tests', function (done) {
 
   elements.forEach(function (id) {
     it('should render element: ' + id, function (done) {
-      var locator = webdriver.By.id(id)
+      var locator = webdriver.By.id(id);
       driver.isElementPresent(locator).then(function (isPresent) {
         expect(isPresent).to.be.true;
         done();
@@ -63,7 +66,7 @@ describe('swagger 1.x spec tests', function (done) {
   });
 
   it('should find the pet link', function(done){
-    var locator = webdriver.By.xpath("//*[@data-id='pet']");
+    var locator = webdriver.By.xpath('//*[@data-id="pet"]');
     driver.isElementPresent(locator).then(function (isPresent) {
       expect(isPresent).to.be.true;
       done();
@@ -71,7 +74,7 @@ describe('swagger 1.x spec tests', function (done) {
   });
 
   it('should find the pet resource description', function(done){
-    var locator = webdriver.By.xpath("//div[contains(., 'Operations about pets')]");
+    var locator = webdriver.By.xpath('//div[contains(., "Operations about pets")]');
     driver.findElements(locator).then(function (elements) {
       expect(elements.length).to.not.equal(0);
       done();
@@ -79,7 +82,7 @@ describe('swagger 1.x spec tests', function (done) {
   });
 
   it('should find the user link', function(done){
-    var locator = webdriver.By.xpath("//*[@data-id='user']");
+    var locator = webdriver.By.xpath('//*[@data-id="user"]');
     driver.isElementPresent(locator).then(function (isPresent) {
       expect(isPresent).to.be.true;
       done();
@@ -87,7 +90,7 @@ describe('swagger 1.x spec tests', function (done) {
   });
 
   it('should find the store link', function(done){
-    var locator = webdriver.By.xpath("//*[@data-id='store']");
+    var locator = webdriver.By.xpath('//*[@data-id="store"]');
     driver.isElementPresent(locator).then(function (isPresent) {
       expect(isPresent).to.be.true;
       done();
diff --git a/test/e2e/v2.js b/test/e2e/v2.js
index f7f540c1..221677d7 100644
--- a/test/e2e/v2.js
+++ b/test/e2e/v2.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var expect = require('chai').expect;
 var webdriver = require('selenium-webdriver');
 var driver = require('./driver');
@@ -14,7 +16,7 @@ var elements = [
   'header'
 ];
 
-describe('swagger 2.0 spec tests', function (done) {
+describe('swagger 2.0 spec tests', function () {
   this.timeout(10 * 1000);
 
   before(function (done) {
@@ -28,8 +30,9 @@ describe('swagger 2.0 spec tests', function (done) {
         var errors = [];
         browserLogs.forEach(function(log){
           // 900 and above is "error" level. Console should not have any errors
-          if (log.level.value > 900)
+          if (log.level.value > 900) {
             console.log('browser error message:', log.message); errors.push(log);
+          }
         });
         expect(errors).to.be.empty;
         done();
@@ -80,7 +83,7 @@ describe('swagger 2.0 spec tests', function (done) {
   });
 
   it('should find the pet link', function(done){
-    var locator = webdriver.By.xpath("//*[@data-id='pet']");
+    var locator = webdriver.By.xpath('//*[@data-id="pet"]');
     driver.isElementPresent(locator).then(function (isPresent) {
       expect(isPresent).to.be.true;
       done();
@@ -88,7 +91,7 @@ describe('swagger 2.0 spec tests', function (done) {
   });
 
   it('should find the pet resource description', function(done){
-    var locator = webdriver.By.xpath("//div[contains(., 'Everything about your Pets')]");
+    var locator = webdriver.By.xpath('//div[contains(., "Operations about pets")]');
     driver.findElements(locator).then(function (elements) {
       expect(elements.length).to.not.equal(0);
       done();
@@ -96,7 +99,7 @@ describe('swagger 2.0 spec tests', function (done) {
   });
 
   it('should find the user link', function(done){
-    var locator = webdriver.By.xpath("//*[@data-id='user']");
+    var locator = webdriver.By.xpath('//*[@data-id="user"]');
     driver.isElementPresent(locator).then(function (isPresent) {
       expect(isPresent).to.be.true;
       done();
@@ -104,7 +107,7 @@ describe('swagger 2.0 spec tests', function (done) {
   });
 
   it('should find the store link', function(done){
-    var locator = webdriver.By.xpath("//*[@data-id='store']");
+    var locator = webdriver.By.xpath('//*[@data-id="store"]');
     driver.isElementPresent(locator).then(function (isPresent) {
       expect(isPresent).to.be.true;
       done();