diff --git a/src/test/apptask-test.js b/src/test/apptask-test.js
index 1b2797553..539361539 100644
--- a/src/test/apptask-test.js
+++ b/src/test/apptask-test.js
@@ -12,12 +12,9 @@ var apptask = require('../apptask.js'),
     config = require('../../config.js'),
     database = require('../database.js'),
     DatabaseError = require('../databaseerror.js'),
-    uuid = require('node-uuid'),
     mkdirp = require('mkdirp'),
     rimraf = require('rimraf'),
     fs = require('fs'),
-    path = require('path'),
-    os = require('os'),
     nock = require('nock');
 
 var APP = {
diff --git a/src/test/config-test.js b/src/test/config-test.js
index 54b8a74bb..b2b149ae4 100644
--- a/src/test/config-test.js
+++ b/src/test/config-test.js
@@ -1,8 +1,6 @@
 /* jslint node:true */
 /* global it:false */
 /* global describe:false */
-/* global before:false */
-/* global after:false */
 
 'use strict';
 
@@ -41,7 +39,7 @@ describe('config', function () {
     });
 
     it('throws with bad key', function (done) {
-        safe(function () { config.set('random', 'value') });
+        safe(function () { config.set('random', 'value'); });
         expect(safe.error).to.be.ok();
         safe(function () { config.set({ random: 'value' }); });
         expect(safe.error).to.be.ok();
diff --git a/src/test/database-test.js b/src/test/database-test.js
index 469800242..5147bd607 100644
--- a/src/test/database-test.js
+++ b/src/test/database-test.js
@@ -7,14 +7,9 @@
 'use strict';
 
 var database = require('../database'),
-    path = require('path'),
-    os = require('os'),
     rimraf = require('rimraf'),
-    crypto = require('crypto'),
     DatabaseError = require('../databaseerror.js'),
-    userdb = require('../userdb.js'),
     tokendb = require('../tokendb.js'),
-    clientdb = require('../clientdb.js'),
     authcodedb = require('../authcodedb.js'),
     appdb = require('../appdb.js'),
     expect = require('expect.js'),
diff --git a/src/test/repo-test.js b/src/test/repo-test.js
index 821214aa6..1716554f9 100644
--- a/src/test/repo-test.js
+++ b/src/test/repo-test.js
@@ -1,10 +1,11 @@
-'use strict';
-
+/* jslint node:true */
 /* global it:false */
 /* global describe:false */
 /* global before:false */
 /* global after:false */
 
+'use strict';
+
 var Repo = require('../repo'),
     crypto = require('crypto'),
     fs = require('fs'),
diff --git a/src/test/server-test.js b/src/test/server-test.js
index 7dd12889b..5d5e1bb42 100644
--- a/src/test/server-test.js
+++ b/src/test/server-test.js
@@ -1,16 +1,14 @@
-'use strict';
-
+/* jslint node:true */
 /* global it:false */
 /* global describe:false */
 /* global before:false */
 /* global after:false */
 
+'use strict';
+
 var Server = require('../server.js'),
     request = require('superagent'),
-    path = require('path'),
-    crypto = require('crypto'),
     rimraf = require('rimraf'),
-    os = require('os'),
     expect = require('expect.js'),
     nock = require('nock'),
     config = require('../../config.js');
diff --git a/src/test/syncer-test.js b/src/test/syncer-test.js
index ded0b024c..ebbf54317 100644
--- a/src/test/syncer-test.js
+++ b/src/test/syncer-test.js
@@ -1,15 +1,11 @@
-'use strict';
-
+/* jslint node:true */
 /* global it:false */
 /* global describe:false */
 
+'use strict';
+
 var syncer = require('../syncer'),
-    crypto = require('crypto'),
-    fs = require('fs'),
-    path = require('path'),
-    assert = require('assert'),
-    expect = require('expect.js'),
-    os = require('os');
+    expect = require('expect.js');
 
 describe('Diff', function () {
     var leftTree, baseTree, rightTree;
diff --git a/src/test/user-test.js b/src/test/user-test.js
index e7e9343f6..d057ed2c5 100644
--- a/src/test/user-test.js
+++ b/src/test/user-test.js
@@ -1,19 +1,15 @@
-'use strict';
-
+/* jslint node:true */
 /* global it:false */
 /* global describe:false */
 /* global before:false */
 /* global after:false */
 
+'use strict';
+
 var user = require('../user.js'),
     UserError = user.UserError,
-    os = require('os'),
-    path = require('path'),
     mkdirp = require('mkdirp'),
-    crypto = require('crypto'),
     rimraf = require('rimraf'),
-    userdb = require('../userdb.js'),
-    tokendb = require('../tokendb.js'),
     expect = require('expect.js'),
     database = require('../database.js'),
     config = require('../../config.js');
diff --git a/src/test/volume-test.js b/src/test/volume-test.js
index 5ff65ae0b..309bb163a 100644
--- a/src/test/volume-test.js
+++ b/src/test/volume-test.js
@@ -1,21 +1,17 @@
-'use strict';
-
+/* jslint node:true */
 /* global it:false */
 /* global describe:false */
 /* global before:false */
 /* global after:false */
 
+'use strict';
+
 var volume = require('../volume.js'),
-    userdb = require('../userdb.js'),
-    tokendb = require('../tokendb.js'),
     database = require('../database.js'),
     User = require('../user.js'),
-    path = require('path'),
     mkdirp = require('mkdirp'),
     rimraf = require('rimraf'),
-    crypto = require('crypto'),
     expect = require('expect.js'),
-    os = require('os'),
     config = require('../../config.js');
 
 var USER;