diff --git a/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.spec.ts b/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.spec.ts
index 703243b60a..e604f7b88d 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.spec.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/diagram.component.spec.ts
@@ -68,7 +68,8 @@ describe('Test ng2-activiti-diagrams ', () => {
         element = fixture.nativeElement;
         fixture.detectChanges();
         componentHandler = jasmine.createSpyObj('componentHandler', [
-            'upgradeAllRegistered'
+            'upgradeAllRegistered',
+            'upgradeElement'
         ]);
         window['componentHandler'] = componentHandler;
     });
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/tooltip/diagram-tooltip.component.html b/ng2-components/ng2-activiti-diagrams/src/components/tooltip/diagram-tooltip.component.html
index 0d2084beba..c39f931559 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/tooltip/diagram-tooltip.component.html
+++ b/ng2-components/ng2-activiti-diagrams/src/components/tooltip/diagram-tooltip.component.html
@@ -1,4 +1,4 @@
-<div class="mdl-tooltip mdl-tooltip--large mdl-tooltip-diagram" [attr.for]="data.id">
+<div alfresco-mdl-tooltip class="mdl-tooltip--large mdl-tooltip-diagram" [attr.for]="data.id">
     <div>
         <div class="mdl-tooltip-header__message"><span>{{getTooltipHeader(data)}}</span></div>
         <span class="mdl-tooltip-body__message">{{getTooltipMessage(data)}}</span>
diff --git a/ng2-components/ng2-alfresco-core/index.ts b/ng2-components/ng2-alfresco-core/index.ts
index 619718fc31..660c9f1dd5 100644
--- a/ng2-components/ng2-alfresco-core/index.ts
+++ b/ng2-components/ng2-alfresco-core/index.ts
@@ -58,6 +58,7 @@ import { MDL } from './src/components/material/mdl-upgrade-element.directive';
 import { AlfrescoMdlButtonDirective } from './src/components/material/mdl-button.directive';
 import { AlfrescoMdlMenuDirective } from './src/components/material/mdl-menu.directive';
 import { AlfrescoMdlTextFieldDirective } from './src/components/material/mdl-textfield.directive';
+import { AlfrescoMdlTooltipDirective } from './src/components/material/mdl-tooltip.directive';
 
 export { ContextMenuModule } from './src/components/context-menu/context-menu.module';
 export { CardViewModule } from './src/components/view/card-view.module';
diff --git a/ng2-components/ng2-alfresco-core/src/components/material/mdl-tooltip.directive.ts b/ng2-components/ng2-alfresco-core/src/components/material/mdl-tooltip.directive.ts
new file mode 100644
index 0000000000..1b596de6f2
--- /dev/null
+++ b/ng2-components/ng2-alfresco-core/src/components/material/mdl-tooltip.directive.ts
@@ -0,0 +1,36 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Directive, ElementRef, AfterViewInit } from '@angular/core';
+
+declare var componentHandler;
+
+@Directive({
+    selector: '[alfresco-mdl-tooltip]'
+})
+export class AlfrescoMdlTooltipDirective implements AfterViewInit {
+
+    constructor(private element: ElementRef) {}
+
+    ngAfterViewInit() {
+        if (componentHandler) {
+            let el = this.element.nativeElement;
+            el.classList.add('mdl-tooltip');
+            componentHandler.upgradeElement(el, 'MaterialTooltip');
+        }
+    }
+}