diff --git a/src/routes/test/file-test.js b/src/routes/test/file-test.js
index 98faeec32..e953664c4 100644
--- a/src/routes/test/file-test.js
+++ b/src/routes/test/file-test.js
@@ -32,10 +32,6 @@ var USERNAME = 'admin', PASSWORD = 'admin', EMAIL ='silly@me.com';
 var volume;
 var server;
 
-function now() {
-    return (new Date()).getTime();
-}
-
 function setup(done) {
     server = new Server(CONFIG);
     server.start(function (err) {
@@ -116,7 +112,7 @@ describe('Server File API', function () {
 
     it('diff', function (done) {
         var index = [
-            { path: 'NEWFILE', sha1: '', mtime: now()+10, size: 20 } // file changed, so no sha1
+            { path: 'NEWFILE', sha1: '', mtime: Date.now()+10, size: 20 } // file changed, so no sha1
         ];
 
         request.post(SERVER_URL + '/api/v1/sync/' + volume.id + '/diff')
diff --git a/src/routes/user.js b/src/routes/user.js
index a97502889..d6075d4e3 100644
--- a/src/routes/user.js
+++ b/src/routes/user.js
@@ -295,7 +295,7 @@ function authenticate(req, res, next) {
  */
 function createToken(req, res, next) {
     var token = tokendb.generateToken();
-    var expires = new Date((new Date()).getTime() + 60 * 60000).toUTCString(); // 1 hour
+    var expires = new Date(Date.now() + 60 * 60000).toUTCString(); // 1 hour
 
     tokendb.add(token, req.user.username, null, expires, function (err) {
         if (err) return next(err);