diff --git a/.travis.yml b/.travis.yml
index 40ff1cf82..6a51a5aa8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,8 @@
 language: node_js
 node_js:
-  - '0.10'
-  - '0.12'
+  - '4'
+  - '6'
+  - '7'
   - '1'
   - '2'
   - 'iojs'
diff --git a/lib/GUI/entry.hbs b/lib/GUI/entry.hbs
index 6e63d3713..a28fe423d 100644
--- a/lib/GUI/entry.hbs
+++ b/lib/GUI/entry.hbs
@@ -8,7 +8,7 @@
     </div>
     <div class="col-md-4 col-sm-4">
       <div class="author pull-right">
-        <small>By: {{ _npmUser.name }}</small>
+        <small>By: {{ author.name }}</small>
       </div>
     </div>
   </div>
diff --git a/lib/auth.js b/lib/auth.js
index c1028e4a9..c7044c9a4 100644
--- a/lib/auth.js
+++ b/lib/auth.js
@@ -195,9 +195,9 @@ Auth.prototype.basic_middleware = function() {
 
     var scheme = parts[0]
     if (scheme === 'Basic') {
-      var credentials = Buffer(parts[1], 'base64').toString()
+      var credentials = new Buffer(parts[1], 'base64').toString()
     } else if (scheme === 'Bearer') {
-      var credentials = self.aes_decrypt(Buffer(parts[1], 'base64')).toString('utf8')
+      var credentials = self.aes_decrypt(new Buffer(parts[1], 'base64')).toString('utf8')
       if (!credentials) return next()
     } else {
       return next()
@@ -286,7 +286,7 @@ Auth.prototype.cookie_middleware = function() {
     req.remote_user = AuthenticatedUser(user.u, user.g)
     req.remote_user.token = token
     next()*/
-    var credentials = self.aes_decrypt(Buffer(token, 'base64')).toString('utf8')
+    var credentials = self.aes_decrypt(new Buffer(token, 'base64')).toString('utf8')
     if (!credentials) return next()
 
     var index = credentials.indexOf(':')
@@ -314,13 +314,13 @@ Auth.prototype.issue_token = function(user) {
     t: ~~(Date.now()/1000),
   }, { indent: false })
 
-  data = Buffer(data, 'utf8')
+  data = new Buffer(data, 'utf8')
   var mac = Crypto.createHmac('sha256', this.secret).update(data).digest()
   return Buffer.concat([ data, mac ]).toString('base64')
 }
 
 Auth.prototype.decode_token = function(str, expire_time) {
-  var buf = Buffer(str, 'base64')
+  var buf = new Buffer(str, 'base64')
   if (buf.length <= 32) throw Error[401]('invalid token')
 
   var data      = buf.slice(0, buf.length - 32)
@@ -355,7 +355,7 @@ Auth.prototype.aes_decrypt = function(buf) {
     var b1 = c.update(buf)
     var b2 = c.final()
   } catch(_) {
-    return Buffer(0)
+    return new Buffer(0)
   }
   return Buffer.concat([ b1, b2 ])
 }
diff --git a/lib/index-api.js b/lib/index-api.js
index 224573fb7..f53d152e1 100644
--- a/lib/index-api.js
+++ b/lib/index-api.js
@@ -364,7 +364,7 @@ module.exports = function(config, auth, storage) {
       })
 
       // this is dumb and memory-consuming, but what choices do we have?
-      stream.end(Buffer(data.data, 'base64'))
+      stream.end(new Buffer(data.data, 'base64'))
       stream.done()
     }
 
diff --git a/test/functional/lib/server.js b/test/functional/lib/server.js
index 4a1af0ef7..0a720b14c 100644
--- a/test/functional/lib/server.js
+++ b/test/functional/lib/server.js
@@ -27,7 +27,7 @@ Server.prototype.request = function(options) {
 }
 
 Server.prototype.auth = function(user, pass) {
-  this.authstr = 'Basic '+(Buffer(user+':'+pass)).toString('base64')
+  this.authstr = 'Basic '+(new Buffer(user+':'+pass)).toString('base64')
   return this.request({
     uri: '/-/user/org.couchdb.user:'+encodeURIComponent(user)+'/-rev/undefined',
     method: 'PUT',