diff --git a/src/index.ts b/src/index.ts
index f8acfc3..1fdfa17 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -21,9 +21,8 @@ const readFile = fs.readFile
       );
     };
 
-const GOOGLE_TOKEN_URL = 'https://www.googleapis.com/oauth2/v4/token';
-const GOOGLE_REVOKE_TOKEN_URL =
-  'https://accounts.google.com/o/oauth2/revoke?token=';
+const GOOGLE_TOKEN_URL = 'https://oauth2.googleapis.com/token';
+const GOOGLE_REVOKE_TOKEN_URL = 'https://oauth2.googleapis.com/revoke?token=';
 
 export interface Transporter {
   request<T>(opts: GaxiosOptions): GaxiosPromise<T>;
diff --git a/test/index.ts b/test/index.ts
index dc8214b..d8ee859 100644
--- a/test/index.ts
+++ b/test/index.ts
@@ -19,10 +19,10 @@ const KEYFILEJSON = './test/assets/key.json';
 const KEYFILENOEMAILJSON = './test/assets/key-no-email.json';
 const KEYCONTENTS = fs.readFileSync(KEYFILE, 'utf8');
 const KEYJSONCONTENTS = fs.readFileSync(KEYFILEJSON, 'utf8');
-const GOOGLE_TOKEN_URLS = ['https://www.googleapis.com', '/oauth2/v4/token'];
+const GOOGLE_TOKEN_URLS = ['https://oauth2.googleapis.com', '/token'];
 const GOOGLE_REVOKE_TOKEN_URLS = [
-  'https://accounts.google.com',
-  '/o/oauth2/revoke',
+  'https://oauth2.googleapis.com',
+  '/revoke',
   '?token=',
 ];
 
@@ -180,7 +180,7 @@ describe('.revokeToken()', () => {
     gtoken.rawToken = {
       access_token: token,
     };
-    gtoken.revokeToken(err => {
+    gtoken.revokeToken(() => {
       assert.strictEqual(gtoken.accessToken, undefined);
       scope.done();
       done();
@@ -248,7 +248,7 @@ describe('.getToken()', () => {
   it('should read .pem keyFile from file', done => {
     const gtoken = new GoogleToken(TESTDATA_KEYFILE);
     const scope = createGetTokenMock();
-    gtoken.getToken((err, token) => {
+    gtoken.getToken(() => {
       assert.deepStrictEqual(gtoken.key, KEYCONTENTS);
       scope.done();
       done();
@@ -258,7 +258,7 @@ describe('.getToken()', () => {
   it('should read .pem keyFile from file async', async () => {
     const gtoken = new GoogleToken(TESTDATA_KEYFILE);
     const scope = createGetTokenMock();
-    const token = await gtoken.getToken();
+    await gtoken.getToken();
     scope.done();
     assert.deepStrictEqual(gtoken.key, KEYCONTENTS);
   });
@@ -279,7 +279,7 @@ describe('.getToken()', () => {
 
   it('should return err if neither key nor keyfile are set', done => {
     const gtoken = new GoogleToken();
-    gtoken.getToken((err, token) => {
+    gtoken.getToken(err => {
       assert(err);
       done();
     });
@@ -288,7 +288,7 @@ describe('.getToken()', () => {
   it('should read .json key from file', done => {
     const gtoken = new GoogleToken(TESTDATA_KEYFILEJSON);
     const scope = createGetTokenMock();
-    gtoken.getToken((err, token) => {
+    gtoken.getToken(err => {
       scope.done();
       assert.strictEqual(err, null);
       const parsed = JSON.parse(KEYJSONCONTENTS);
@@ -305,7 +305,7 @@ describe('.getToken()', () => {
     });
     const gtoken = new GoogleToken(opts);
     const scope = createGetTokenMock();
-    const token = await gtoken.getToken();
+    await gtoken.getToken();
     scope.done();
     assert.deepStrictEqual(gtoken.key, KEYCONTENTS);
   });
@@ -492,7 +492,7 @@ describe('.getToken()', () => {
       });
       const fakeToken = 'nodeftw';
       const scope = createGetTokenMock(200, {access_token: fakeToken});
-      gtoken.getToken((err, token) => {
+      gtoken.getToken(err => {
         scope.done();
         assert.strictEqual(err, null);
         assert(customTransporterWasUsed);
@@ -527,7 +527,7 @@ describe('.getToken()', () => {
       const ERROR = 'An error occurred.';
       const gtoken = new GoogleToken(TESTDATA);
       const scope = createGetTokenMock(500, {error: ERROR});
-      gtoken.getToken((err, token) => {
+      gtoken.getToken(err => {
         scope.done();
         assert(err);
         assert.strictEqual(gtoken.rawToken, undefined);
@@ -544,7 +544,7 @@ describe('.getToken()', () => {
       const DESCRIPTION = 'more detailed message';
       const RESPBODY = {error: ERROR, error_description: DESCRIPTION};
       const scope = createGetTokenMock(500, RESPBODY);
-      gtoken.getToken((err, token) => {
+      gtoken.getToken(err => {
         scope.done();
         assert(err instanceof Error);
         if (err) {
@@ -558,7 +558,7 @@ describe('.getToken()', () => {
       const gtoken = new GoogleToken(TESTDATA);
       const message = 'Request failed with status code 404';
       const scope = createGetTokenMock(404);
-      gtoken.getToken((err, token) => {
+      gtoken.getToken(err => {
         scope.done();
         assert(err instanceof Error);
         if (err) assert.strictEqual(err.message, message);