diff --git a/lib/metadata_service/endpoint.js b/lib/metadata_service/endpoint.js
deleted file mode 100644
index b7c62598e0..0000000000
--- a/lib/metadata_service/endpoint.js
+++ /dev/null
@@ -1,6 +0,0 @@
-var Endpoint = {
-  IPv4: 'http://169.254.169.254',
-  IPv6: 'http://[fd00:ec2::254]',
-};
-
-module.exports = Endpoint;
diff --git a/lib/metadata_service/get_endpoint.js b/lib/metadata_service/get_endpoint.js
new file mode 100644
index 0000000000..98a6cfbccb
--- /dev/null
+++ b/lib/metadata_service/get_endpoint.js
@@ -0,0 +1,8 @@
+var getEndpoint = function() {
+  return {
+    IPv4: 'http://169.254.169.254',
+    IPv6: 'http://[fd00:ec2::254]',
+  };
+};
+
+module.exports = getEndpoint;
diff --git a/lib/metadata_service/get_metadata_service_endpoint.js b/lib/metadata_service/get_metadata_service_endpoint.js
index f63ccebbaf..f9ecb555c5 100644
--- a/lib/metadata_service/get_metadata_service_endpoint.js
+++ b/lib/metadata_service/get_metadata_service_endpoint.js
@@ -1,6 +1,6 @@
 var AWS = require('../core');
 
-var Endpoint = require('./endpoint');
+var Endpoint = require('./get_endpoint')();
 var EndpointMode = require('./endpoint_mode');
 
 var ENDPOINT_CONFIG_OPTIONS = require('./endpoint_config_options').ENDPOINT_CONFIG_OPTIONS;
diff --git a/test/metadata_service/get_metadata_service_endpoint.spec.js b/test/metadata_service/get_metadata_service_endpoint.spec.js
index f6ee4d6a83..e2b26a5339 100644
--- a/test/metadata_service/get_metadata_service_endpoint.spec.js
+++ b/test/metadata_service/get_metadata_service_endpoint.spec.js
@@ -1,7 +1,7 @@
 var helpers = require('./../helpers');
 var getMetadataServiceEndpoint = require('../../lib/metadata_service/get_metadata_service_endpoint');
 
-var Endpoint = require('../../lib/metadata_service/endpoint');
+var Endpoint = require('../../lib/metadata_service/get_endpoint')();
 var EndpointMode = require('../../lib/metadata_service/endpoint_mode');
 var ENDPOINT_CONFIG_OPTIONS = require('../../lib/metadata_service/endpoint_config_options').ENDPOINT_CONFIG_OPTIONS;