diff --git a/test/GitHubInfo.spec.js b/test/GitHubInfo.spec.js
index 7969e6d8..dbf49a92 100644
--- a/test/GitHubInfo.spec.js
+++ b/test/GitHubInfo.spec.js
@@ -1,6 +1,13 @@
 import { assert } from 'chai';
 import GitHubInfo from '../lib/src/GitHubInfo';
 
+const TOKEN = process.env.GREN_GITHUB_TOKEN;
+
+if (!TOKEN) {
+    console.log(chalk.blue('Token not present, skipping Gren tests.'));
+    describe = describe.skip;
+}
+
 describe('GitHubInfo', () => {
     let githubInfo;
 
@@ -20,7 +27,7 @@ describe('GitHubInfo', () => {
             assert.deepEqual(repo, 'github-release-notes', 'Get the repository name from repo\'s folder');
         });
 
-        if (process.env.GREN_GITHUB_TOKEN) {
+        if (TOKEN) {
             githubInfo.token.then(({ token }) => {
                 assert.isOk(token);
             });
@@ -30,10 +37,9 @@ describe('GitHubInfo', () => {
             assert.isOk(options[0].repo);
             assert.isOk(options[0].username);
 
-            if (process.env.GREN_GITHUB_TOKEN) {
+            if (TOKEN) {
                 assert.isOk(options[1].token);
             }
         });
-
     });
-})
+});
diff --git a/test/Gren.spec.js b/test/Gren.spec.js
index c4786436..273cdf22 100644
--- a/test/Gren.spec.js
+++ b/test/Gren.spec.js
@@ -12,11 +12,15 @@ if (!TOKEN) {
 }
 
 describe('Gren', () => {
-    const gren = new Gren({
-        token: TOKEN,
-        username: 'github-tools',
-        repo: 'github-release-notes',
-        quiet: true
+    let gren;
+
+    before(() => {
+        gren = new Gren({
+            token: TOKEN,
+            username: 'github-tools',
+            repo: 'github-release-notes',
+            quiet: true
+        });
     });
 
     it('Should throw an error', () => {