diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts
new file mode 100644
index 0000000000..0de606f054
--- /dev/null
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts
@@ -0,0 +1,96 @@
+/*!
+ * @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 {
+    it,
+    describe,
+    expect,
+    beforeEach
+} from '@angular/core/testing';
+
+import { ActivitiFilters } from './activiti-filters.component';
+import { ActivitiTaskListService } from '../services/activiti-tasklist.service';
+import { Observable } from 'rxjs/Rx';
+import { FilterModel } from '../models/filter.model';
+
+describe('ActivitiFilters', () => {
+
+    let filterList: ActivitiFilters;
+
+    let fakeGlobalFilter = [];
+    fakeGlobalFilter.push(new FilterModel('FakeInvolvedTasks', false, 'glyphicon-align-left', '', 'open',  'fake-involved'));
+    fakeGlobalFilter.push(new FilterModel('FakeMyTasks', false, 'glyphicon-align-left', '', 'open',  'fake-assignee'));
+
+    let fakeGlobalFilterPromise = new Promise(function (resolve, reject) {
+        resolve(fakeGlobalFilter);
+    });
+
+    let fakeErrorFilterList = {
+        error: 'wrong request'
+    };
+
+    let fakeErrorFilterPromise = new Promise(function (resolve, reject) {
+        reject(fakeErrorFilterList);
+    });
+
+    beforeEach(() => {
+        let activitiService = new ActivitiTaskListService(null);
+        filterList = new ActivitiFilters(null, null, activitiService);
+    });
+
+    it('should return the filter task list', (done) => {
+        spyOn(filterList.activiti, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeGlobalFilterPromise));
+
+        filterList.onSuccess.subscribe( (res) => {
+            expect(res).toBeDefined();
+            expect(res).toEqual('Filter task list loaded');
+            expect(filterList.filters).toBeDefined();
+            expect(filterList.filters.length).toEqual(2);
+            expect(filterList.filters[0].name).toEqual('FakeInvolvedTasks');
+            expect(filterList.filters[1].name).toEqual('FakeMyTasks');
+            done();
+        });
+
+        filterList.ngOnInit();
+    });
+
+    it('should emit an error with a bad response', (done) => {
+        spyOn(filterList.activiti, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeErrorFilterPromise));
+
+        filterList.onError.subscribe( (err) => {
+            expect(err).toBeDefined();
+            expect(err).toEqual('Error to load a task filter list');
+            done();
+        });
+
+        filterList.ngOnInit();
+    });
+
+    it('should emit an event when a filter is selected', (done) => {
+        let currentFilter = new FilterModel('FakeInvolvedTasks', false, 'glyphicon-align-left', '', 'open', 'fake-involved');
+
+        filterList.filterClick.subscribe((filter: FilterModel) => {
+            expect(filter).toBeDefined();
+            expect(filter).toEqual(currentFilter);
+            expect(filterList.currentFilter).toEqual(currentFilter);
+            done();
+        });
+
+        filterList.selectFilter(currentFilter);
+    });
+
+});
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts
index 26d625e513..68228880b8 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts
@@ -38,6 +38,12 @@ export class ActivitiFilters implements OnInit {
     @Output()
     filterClick: EventEmitter<FilterModel> = new EventEmitter<FilterModel>();
 
+    @Output()
+    onSuccess: EventEmitter<string> = new EventEmitter<string>();
+
+    @Output()
+    onError: EventEmitter<string> = new EventEmitter<string>();
+
     private filterObserver: Observer<FilterModel>;
     filter$: Observable<FilterModel>;
 
@@ -77,9 +83,11 @@ export class ActivitiFilters implements OnInit {
                 res.forEach((filter) => {
                     this.filterObserver.next(filter);
                 });
+                this.onSuccess.emit('Filter task list loaded');
             },
             (err) => {
                 console.log(err);
+                this.onError.emit('Error to load a task filter list');
             }
         );
     }
@@ -89,6 +97,7 @@ export class ActivitiFilters implements OnInit {
      * @param filter
      */
     public selectFilter(filter: FilterModel) {
+        this.currentFilter = filter;
         this.filterClick.emit(filter);
     }
 }