diff --git a/.travis.yml b/.travis.yml
index 24ef94dc..e3af9fcb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,19 +11,22 @@ cache:
 ## Spin up glitlab instance and sleep for 60 seconds
 before_script:
   ## Spin up container
+  - cd test/docker/
   - docker-compose -f docker-compose.test.yml up
+  - cd .
 
   ## Get the docker env variables
   - export PERSONAL_ACCESS_TOKEN=$(docker exec -i gitlab echo PERSONAL_ACCESS_TOKEN)
-  - export GITLAB_URL=$(docker exec -i gitlab echo PERSONAL_ACCESS_TOKEN)
+  - export GITLAB_URL=$(docker exec -i gitlab echo GITLAB_URL)
 
   ## Sleep before performing commands on container
-  - sleep 10000
+  - sleep 30
 
 ## run tests
 script:
   - npm run test:infrastructure
   - npm run test:bundles
+  - npm run test:services
 
 after_script:
   - docker-compose -f docker-compose.test.yml down
@@ -34,4 +37,3 @@ jobs:
       script: npm run lint
     - stage: build
       script: npm run build
-    #   script: npm run test:services
\ No newline at end of file
diff --git a/test/docker-compose.test.yml b/test/docker/docker-compose.test.yml
similarity index 100%
rename from test/docker-compose.test.yml
rename to test/docker/docker-compose.test.yml
diff --git a/test/docker-entrypoint b/test/docker/docker-entrypoint
similarity index 100%
rename from test/docker-entrypoint
rename to test/docker/docker-entrypoint
diff --git a/test/init b/test/docker/init
similarity index 100%
rename from test/init
rename to test/docker/init
diff --git a/test/test.rb b/test/docker/test.rb
similarity index 100%
rename from test/test.rb
rename to test/docker/test.rb
diff --git a/test/tests/services/Projects.js b/test/tests/services/Projects.js
index 0405fc1b..467306ea 100644
--- a/test/tests/services/Projects.js
+++ b/test/tests/services/Projects.js
@@ -1,8 +1,13 @@
 import { Projects } from '../../src';
 
+const credentials = {
+	url: process.env.GITLAB_URL,
+	token: process.env.PERSONAL_ACCESS_TOKEN
+}
+
 describe('Projects.all', () => {
   it('should return empty array', async () => {
-    const service = new Projects({ url: process.env.GITLAB_URL, token: process.env.API_TOKEN });
+    const service = new Projects(credentials);
     const projects = await service.all();
 
     expect(projects).toEqual([]);