diff --git a/ghost/security/test/password_spec.js b/ghost/security/test/password.test.js
similarity index 83%
rename from ghost/security/test/password_spec.js
rename to ghost/security/test/password.test.js
index 9b66e8d275..8c5bfd99f0 100644
--- a/ghost/security/test/password_spec.js
+++ b/ghost/security/test/password.test.js
@@ -1,5 +1,5 @@
-const should = require('should');
-const security = require('../../../../core/server/lib/security');
+require('./utils');
+const security = require('../');
 
 describe('Lib: Security - Password', function () {
     it('hash plain password', function () {
diff --git a/ghost/security/test/string_spec.js b/ghost/security/test/string.test.js
similarity index 97%
rename from ghost/security/test/string_spec.js
rename to ghost/security/test/string.test.js
index 2d50e115b1..c3daade846 100644
--- a/ghost/security/test/string_spec.js
+++ b/ghost/security/test/string.test.js
@@ -1,5 +1,5 @@
-const should = require('should');
-const security = require('../../../../core/server/lib/security');
+require('./utils');
+const security = require('../');
 
 describe('Lib: Security - String', function () {
     describe('Safe String', function () {
diff --git a/ghost/security/test/tokens_spec.js b/ghost/security/test/tokens.test.js
similarity index 97%
rename from ghost/security/test/tokens_spec.js
rename to ghost/security/test/tokens.test.js
index e075c93eb5..6d45ea0450 100644
--- a/ghost/security/test/tokens_spec.js
+++ b/ghost/security/test/tokens.test.js
@@ -1,6 +1,7 @@
+require('./utils');
 const should = require('should');
 const uuid = require('uuid');
-const security = require('../../../../core/server/lib/security');
+const security = require('../');
 
 describe('Utils: tokens', function () {
     it('generate', function () {
@@ -87,7 +88,7 @@ describe('Utils: tokens', function () {
         should.not.exist(parts.dbHash);
     });
 
-    it('extract', function () {
+    it('extract - hashed password', function () {
         const expires = Date.now() + 60 * 1000;
         const dbHash = uuid.v4();
         let token;