diff --git a/.travis.yml b/.travis.yml
index 3a5d6d84f9..08c3c00b76 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,26 +31,27 @@ env:
     - MODULE=ng2-activiti-form
     - MODULE=ng2-activiti-tasklist
     - MODULE=ng2-activiti-processlist
+    - MODULE=ng2-activiti-diagrams
     - MODULE=ng2-activiti-analytics
     - MODULE=ng2-alfresco-userinfo
 
 before_script:
   - if ([ "$MODULE" != "ng2-alfresco-core" ]); then
-        (cd ng2-components/ng2-alfresco-core; npm install; npm link);
+        (cd ng2-components/ng2-alfresco-core; npm install; npm link; cd ng2-components/$MODULE; npm link ng2-alfresco-core;);
     fi
   - if ([ "$MODULE" == "ng2-alfresco-documentlist" ] || [ "$MODULE" == "ng2-alfresco-webscript" ] || [ "$MODULE" == "ng2-activiti-processlist" ] || [ "$MODULE" == "ng2-activiti-tasklist" ]); then
-        (cd ng2-components/ng2-alfresco-datatable; npm link ng2-alfresco-core; npm install; npm link);
+        (cd ng2-components/ng2-alfresco-datatable; npm install; npm link);
     fi
   - if ([ "$MODULE" == "ng2-activiti-tasklist" ] || [ "$MODULE" == "ng2-activiti-processlist" ]); then
-        (cd ng2-components/ng2-activiti-form; npm link ng2-alfresco-core; npm install; npm link);
+        (cd ng2-components/ng2-activiti-form; npm install; npm link);
     fi
   - if ([ "$MODULE" == "ng2-activiti-processlist" ]); then
-        (cd ng2-components/ng2-activiti-tasklist; npm link ng2-alfresco-core; npm link ng2-alfresco-datatable; npm link ng2-activiti-form; npm install; npm link);
+        (cd ng2-components/ng2-activiti-tasklist; npm link ng2-alfresco-datatable; npm link ng2-activiti-form; npm install; npm link);
+    fi
+  - if ([ "$MODULE" == "ng2-activiti-analitycs" ]); then
+        (cd ng2-components/ng2-activiti-diagrams; npm install; npm link);
     fi
   - cd ng2-components/$MODULE;
-  - if ([ "$MODULE" != "ng2-alfresco-core" ]); then
-        npm link ng2-alfresco-core;
-    fi
   - if ([ "$MODULE" == "ng2-alfresco-documentlist" ] || [ "$MODULE" == "ng2-alfresco-webscript" ] || [ "$MODULE" == "ng2-activiti-processlist" ] || [ "$MODULE" == "ng2-activiti-tasklist" ]); then
         npm link ng2-alfresco-datatable;
     fi
@@ -60,6 +61,9 @@ before_script:
   - if ([ "$MODULE" == "ng2-activiti-processlist" ]); then
         npm link ng2-activiti-tasklist;
     fi
+  - if ([ "$MODULE" == "ng2-activiti-analitycs" ]); then
+        npm link ng2-activiti-diagrams;
+    fi
   - npm install;
   - npm run travis
   - ls -ltrh ./node_modules/
@@ -83,5 +87,6 @@ cache:
   - ng2-components/ng2-alfresco-viewer/node_modules
   - ng2-components/ng2-alfresco-webscript/node_modules
   - ng2-components/ng2-alfresco-tag/node_modules
-  - ng2-components/ng2-alfresco-analytics/node_modules
+  - ng2-components/ng2-activiti-analytics/node_modules
   - ng2-components/ng2-alfresco-userinfo/node_modules
+  - ng2-components/ng2-activiti-diagrams/node_modules
diff --git a/appveyor.yml b/appveyor.yml
index 7f8f94b30f..7e892d3323 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -19,6 +19,7 @@ environment:
   - COMPONENT_NAME: ng2-activiti-form
   - COMPONENT_NAME: ng2-activiti-tasklist
   - COMPONENT_NAME: ng2-activiti-processlist
+  - COMPONENT_NAME: ng2-activiti-diagrams
   - COMPONENT_NAME: ng2-activiti-analytics
   - COMPONENT_NAME: ng2-alfresco-userinfo
 
@@ -41,6 +42,7 @@ install:
   - IF %COMPONENT_NAME% EQU ng2-activiti-processlist (npm link ng2-alfresco-datatable && npm link ng2-activiti-form && npm link ng2-activiti-tasklist)
   - IF %COMPONENT_NAME% EQU ng2-activiti-tasklist (npm link ng2-alfresco-datatable && npm link ng2-activiti-form)
   - IF %COMPONENT_NAME% EQU ng2-alfresco-webscript (npm link ng2-alfresco-datatable)
+  - IF %COMPONENT_NAME% EQU ng2-activiti-analytics (npm link ng2-alfresco-diagrams)
   - npm install
 
 # Post-install test scripts.