diff --git a/src/configuration.js b/src/configuration.js
index ed6a22c93..814d03b49 100644
--- a/src/configuration.js
+++ b/src/configuration.js
@@ -104,7 +104,7 @@ function applyConfiguration(config) {
   configuration.options.method = configuration.options.method.map(method => method.toUpperCase());
 
   if (configuration.options.user) {
-    const authHeader = `Authorization:Basic ${new Buffer(configuration.options.user).toString('base64')}`;
+    const authHeader = `Authorization:Basic ${Buffer.from(configuration.options.user).toString('base64')}`;
     configuration.options.header.push(authHeader);
   }
 
diff --git a/test/integration/cli/cli-test.js b/test/integration/cli/cli-test.js
index 1f00764b9..51b2d9648 100644
--- a/test/integration/cli/cli-test.js
+++ b/test/integration/cli/cli-test.js
@@ -338,7 +338,7 @@ describe('CLI', () => {
 
       it('should have an authorization header in the request', () => assert.isOk(runtimeInfo.server.requests['/machines'][0].headers.authorization));
 
-      it('should contain a base64 encoded string of the username and password', () => assert.isOk(runtimeInfo.server.requests['/machines'][0].headers.authorization === (`Basic ${new Buffer('username:password').toString('base64')}`)));
+      it('should contain a base64 encoded string of the username and password', () => assert.isOk(runtimeInfo.server.requests['/machines'][0].headers.authorization === (`Basic ${Buffer.from('username:password').toString('base64')}`)));
     });