diff --git a/lib/http.js b/lib/http.js
index e3707ffa62b25d..5f2fe6dc68f571 100644
--- a/lib/http.js
+++ b/lib/http.js
@@ -21,7 +21,7 @@
 
 'use strict';
 
-const { Agent, globalAgent } = require('_http_agent');
+const httpAgent = require('_http_agent');
 const { ClientRequest } = require('_http_client');
 const { methods } = require('_http_common');
 const { IncomingMessage } = require('_http_incoming');
@@ -52,9 +52,8 @@ module.exports = {
   _connectionListener,
   METHODS: methods.slice().sort(),
   STATUS_CODES,
-  Agent,
+  Agent: httpAgent.Agent,
   ClientRequest,
-  globalAgent,
   IncomingMessage,
   OutgoingMessage,
   Server,
@@ -76,3 +75,14 @@ Object.defineProperty(module.exports, 'maxHeaderSize', {
     return maxHeaderSize;
   }
 });
+
+Object.defineProperty(module.exports, 'globalAgent', {
+  configurable: true,
+  enumerable: true,
+  get() {
+    return httpAgent.globalAgent;
+  },
+  set(value) {
+    httpAgent.globalAgent = value;
+  }
+});
diff --git a/lib/https.js b/lib/https.js
index 6f31315a559ef9..67a4648e3b70a2 100644
--- a/lib/https.js
+++ b/lib/https.js
@@ -283,7 +283,7 @@ function request(...args) {
     options = util._extend(options, args.shift());
   }
 
-  options._defaultAgent = globalAgent;
+  options._defaultAgent = module.exports.globalAgent;
   args.unshift(options);
 
   return new ClientRequest(...args);
diff --git a/test/parallel/test-http-client-override-global-agent.js b/test/parallel/test-http-client-override-global-agent.js
new file mode 100644
index 00000000000000..c36c9d26a8dd63
--- /dev/null
+++ b/test/parallel/test-http-client-override-global-agent.js
@@ -0,0 +1,26 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const http = require('http');
+
+const server = http.Server(common.mustCall((req, res) => {
+  res.writeHead(200);
+  res.end('Hello, World!');
+}));
+
+server.listen(0, common.mustCall(() => {
+  const agent = new http.Agent();
+  const name = agent.getName({ port: server.address().port });
+  http.globalAgent = agent;
+
+  makeRequest();
+  assert(agent.sockets.hasOwnProperty(name)); // agent has indeed been used
+}));
+
+function makeRequest() {
+  const req = http.get({
+    port: server.address().port
+  });
+  req.on('close', () =>
+    server.close());
+}
diff --git a/test/parallel/test-https-client-override-global-agent.js b/test/parallel/test-https-client-override-global-agent.js
new file mode 100644
index 00000000000000..12b5ae596bc837
--- /dev/null
+++ b/test/parallel/test-https-client-override-global-agent.js
@@ -0,0 +1,38 @@
+'use strict';
+const common = require('../common');
+const fixtures = require('../common/fixtures');
+const assert = require('assert');
+const https = require('https');
+
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+
+// Disable strict server certificate validation by the client
+process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
+
+const options = {
+  key: fixtures.readKey('agent1-key.pem'),
+  cert: fixtures.readKey('agent1-cert.pem')
+};
+
+const server = https.Server(options, common.mustCall((req, res) => {
+  res.writeHead(200);
+  res.end('Hello, World!');
+}));
+
+server.listen(0, common.mustCall(() => {
+  const agent = new https.Agent();
+  const name = agent.getName({ port: server.address().port });
+  https.globalAgent = agent;
+
+  makeRequest();
+  assert(agent.sockets.hasOwnProperty(name)); // agent has indeed been used
+}));
+
+function makeRequest() {
+  const req = https.get({
+    port: server.address().port
+  });
+  req.on('close', () =>
+    server.close());
+}