diff --git a/server.js b/server.js
index 029b10982b221..7219a9ac2c258 100644
--- a/server.js
+++ b/server.js
@@ -2576,7 +2576,7 @@ cache(function(data, match, sendBadge, request) {
   var format = match[3];
   request({
       method: 'GET',
-      uri: 'http://api.codeclimate.com/v1/repos?github_slug=' + userRepo,
+      uri: 'https://api.codeclimate.com/v1/repos?github_slug=' + userRepo,
       json: true
   }, function (err, res, body) {
     var badgeData = getBadgeData(match[1] === 'c' ? 'coverage' : 'maintainability', data);
diff --git a/service-tests/codeclimate.js b/service-tests/codeclimate.js
index dff5051671d7c..3971535837b95 100644
--- a/service-tests/codeclimate.js
+++ b/service-tests/codeclimate.js
@@ -21,8 +21,11 @@ t.create('maintainability score for non-existent repo')
 
 t.create('maintainability score without content-disposition')
   .get('/maintainability/Nickersoft/dql.json')
-  .intercept(nock => nock('https://api.codeclimate.com/v1/badges')
-    .head('/78ac0fa85c83fea5213a/maintainability')
+  .intercept(nock => nock('https://api.codeclimate.com')
+    .get('/v1/repos')
+    .query({ github_slug: 'Nickersoft/dql' })
+    .reply(200, { data: [{ attributes: { badge_token: '78ac0fa85c83fea5213a' } }] })
+    .head('/v1/badges/78ac0fa85c83fea5213a/maintainability')
     .reply(200))
   .expectJSON({ name: 'maintainability', value: 'invalid' });
 
@@ -42,8 +45,11 @@ t.create('test coverage score for non-existent repo')
 
 t.create('test coverage score without content-disposition')
   .get('/c/Nickersoft/dql.json')
-  .intercept(nock => nock('https://api.codeclimate.com/v1/badges')
-    .head('/78ac0fa85c83fea5213a/test_coverage')
+  .intercept(nock => nock('https://api.codeclimate.com')
+    .get('/v1/repos')
+    .query({ github_slug: 'Nickersoft/dql' })
+    .reply(200, { data: [{ attributes: { badge_token: '78ac0fa85c83fea5213a' } }] })
+    .head('/v1/badges/78ac0fa85c83fea5213a/test_coverage')
     .reply(200))
   .expectJSON({ name: 'coverage', value: 'invalid' });