diff --git a/src/routes/test/apps-test.js b/src/routes/test/apps-test.js
index 7c294f44a..d627bf4c8 100644
--- a/src/routes/test/apps-test.js
+++ b/src/routes/test/apps-test.js
@@ -165,7 +165,7 @@ describe('Apps', function () {
                 token_1 = tokendb.generateToken();
 
                 // HACK to get a token for second user (passwords are generated and the user should have gotten a password setup link...)
-                tokendb.add(token_1, tokendb.PREFIX_USER + USER_1_ID, 'test-client-id',  Date.now() + 100000, '*', callback);
+                tokendb.add(token_1, USER_1_ID, 'test-client-id',  Date.now() + 100000, '*', callback);
             },
 
             function (callback) {
diff --git a/src/routes/test/clients-test.js b/src/routes/test/clients-test.js
index 4a7c87b93..ba41b8721 100644
--- a/src/routes/test/clients-test.js
+++ b/src/routes/test/clients-test.js
@@ -543,7 +543,7 @@ describe('Clients', function () {
                 expect(result.statusCode).to.equal(200);
 
                 expect(result.body.tokens.length).to.eql(1);
-                expect(result.body.tokens[0].identifier).to.eql('user-' + USER_0.id);
+                expect(result.body.tokens[0].identifier).to.eql(USER_0.id);
 
                 done();
             });
@@ -596,7 +596,7 @@ describe('Clients', function () {
                 expect(result.statusCode).to.equal(200);
 
                 expect(result.body.tokens.length).to.eql(1);
-                expect(result.body.tokens[0].identifier).to.eql('user-' + USER_0.id);
+                expect(result.body.tokens[0].identifier).to.eql(USER_0.id);
 
                 superagent.del(SERVER_URL + '/api/v1/oauth/clients/cid-webadmin/tokens')
                 .query({ access_token: token })
diff --git a/src/routes/test/eventlog-test.js b/src/routes/test/eventlog-test.js
index 10f1402c4..6f01dbe0c 100644
--- a/src/routes/test/eventlog-test.js
+++ b/src/routes/test/eventlog-test.js
@@ -67,7 +67,7 @@ function setup(done) {
             token_1 = tokendb.generateToken();
 
             // HACK to get a token for second user (passwords are generated and the user should have gotten a password setup link...)
-            tokendb.add(token_1, tokendb.PREFIX_USER + USER_1_ID, 'test-client-id',  Date.now() + 100000, '*', callback);
+            tokendb.add(token_1, USER_1_ID, 'test-client-id',  Date.now() + 100000, '*', callback);
         }
 
     ], done);
diff --git a/src/routes/test/profile-test.js b/src/routes/test/profile-test.js
index f52207b1c..b2d63b836 100644
--- a/src/routes/test/profile-test.js
+++ b/src/routes/test/profile-test.js
@@ -115,7 +115,7 @@ describe('Profile API', function () {
             var token = tokendb.generateToken();
             var expires = Date.now() - 2000; // 1 sec
 
-            tokendb.add(token, tokendb.PREFIX_USER + user_0.id, null, expires, '*', function (error) {
+            tokendb.add(token, user_0.id, null, expires, '*', function (error) {
                 expect(error).to.not.be.ok();
 
                 superagent.get(SERVER_URL + '/api/v1/profile').query({ access_token: token }).end(function (error, result) {
diff --git a/src/routes/test/user-test.js b/src/routes/test/user-test.js
index 5bb694ce8..8c3082887 100644
--- a/src/routes/test/user-test.js
+++ b/src/routes/test/user-test.js
@@ -160,7 +160,7 @@ describe('User API', function () {
         var token = tokendb.generateToken();
         var expires = Date.now() + 2000; // 1 sec
 
-        tokendb.add(token, tokendb.PREFIX_USER + user_0.id, null, expires, '*', function (error) {
+        tokendb.add(token, user_0.id, null, expires, '*', function (error) {
             expect(error).to.not.be.ok();
 
             setTimeout(function () {
@@ -260,7 +260,7 @@ describe('User API', function () {
 
             checkMails(2, function () {
               // HACK to get a token for second user (passwords are generated and the user should have gotten a password setup link...)
-              tokendb.add(token_1, tokendb.PREFIX_USER + user_1.id, 'test-client-id',  Date.now() + 10000, '*', done);
+              tokendb.add(token_1, user_1.id, 'test-client-id',  Date.now() + 10000, '*', done);
             });
         });
     });
diff --git a/src/test/database-test.js b/src/test/database-test.js
index bc52363fe..a1f92df18 100644
--- a/src/test/database-test.js
+++ b/src/test/database-test.js
@@ -366,21 +366,21 @@ describe('database', function () {
     describe('token', function () {
         var TOKEN_0 = {
             accessToken: tokendb.generateToken(),
-            identifier: tokendb.PREFIX_USER + '0',
+            identifier: '0',
             clientId: 'clientid-0',
             expires: Date.now() + 60 * 60000,
             scope: '*'
         };
         var TOKEN_1 = {
             accessToken: tokendb.generateToken(),
-            identifier: tokendb.PREFIX_USER + '1',
+            identifier: '1',
             clientId: 'clientid-1',
             expires: Number.MAX_SAFE_INTEGER,
             scope: '*'
         };
         var TOKEN_2 = {
             accessToken: tokendb.generateToken(),
-            identifier: tokendb.PREFIX_USER + '2',
+            identifier: '2',
             clientId: 'clientid-2',
             expires: Date.now(),
             scope: '*'
diff --git a/src/test/janitor-test.js b/src/test/janitor-test.js
index b7d953d00..f06155970 100644
--- a/src/test/janitor-test.js
+++ b/src/test/janitor-test.js
@@ -30,14 +30,14 @@ describe('janitor', function () {
 
     var TOKEN_0 = {
         accessToken: tokendb.generateToken(),
-        identifier: tokendb.PREFIX_USER + '0',
+        identifier: '0',
         clientId: 'clientid-0',
         expires: Date.now() + 60 * 60 * 1000,
         scope: '*'
     };
     var TOKEN_1 = {
         accessToken: tokendb.generateToken(),
-        identifier: tokendb.PREFIX_USER + '1',
+        identifier: '1',
         clientId: 'clientid-1',
         expires: Date.now() - 1000,
         scope: '*',