diff --git a/.travis.yml b/.travis.yml
index 675815e5a0..7eb1895017 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,8 +17,6 @@ before_install:
   - export CHROME_BIN=/usr/bin/google-chrome
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
-  - (cd ng2-components/ng2-alfresco-core; npm install; npm link);(cd ng2-components/ng2-alfresco-datatable; npm link ng2-alfresco-core; npm install; npm link)
-
 env:
   matrix:
     - MODULE=ng2-alfresco-core
@@ -30,7 +28,21 @@ env:
     - MODULE=ng2-alfresco-viewer
 
 before_script:
-  - cd ng2-components/$MODULE; npm install; npm run travis
+  - if ([ "$MODULE" != "ng2-alfresco-core" ] && [ "$MODULE" != "ng2-alfresco-viewer" ]); then
+        (cd ng2-components/ng2-alfresco-core; npm install; npm link);
+    fi
+  - if [[ "$MODULE" == "ng2-alfresco-documentlist" ]]; then
+        (cd ng2-components/ng2-alfresco-datatable;npm link ng2-alfresco-core; npm install; npm link);
+    fi
+  - cd ng2-components/$MODULE;
+  - if ([ "$MODULE" != "ng2-alfresco-core" ] && [ "$MODULE" != "ng2-alfresco-viewer" ]); then
+        npm link ng2-alfresco-core;
+    fi
+  - if [[ "$MODULE" == "ng2-alfresco-documentlist" ]]; then
+        npm link ng2-alfresco-datatable;
+    fi
+  - npm install;
+  - npm run travis
   - ls -ltrh ./node_modules/
 script: npm run test
 # Send coverage data to Coveralls