diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c
index 0a68a19f43b..a1b5597fff5 100644
--- a/dlls/mstask/tests/task_trigger.c
+++ b/dlls/mstask/tests/task_trigger.c
@@ -2,6 +2,7 @@
  * Test suite for Task interface
  *
  * Copyright (C) 2008 Google (Roy Shea)
+ * Copyright (C) 2018 Dmitry Timoshkov
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -35,10 +36,6 @@ static BOOL setup_trigger(void)
     HRESULT hres;
     const WCHAR task_name[] = {'T','e','s','t','i','n','g', 0};
 
-    hres = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER,
-            &IID_ITaskScheduler, (void **) &test_task_scheduler);
-    if(hres != S_OK)
-        return FALSE;
     hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name,
             &CLSID_CTask, &IID_ITask, (IUnknown**)&test_task);
     if(hres != S_OK)
@@ -60,7 +57,6 @@ static void cleanup_trigger(void)
 {
     ITaskTrigger_Release(test_trigger);
     ITask_Release(test_task);
-    ITaskScheduler_Release(test_task_scheduler);
 }
 
 static BOOL compare_trigger_state(TASK_TRIGGER found_state,
@@ -376,10 +372,86 @@ static void test_SetTrigger_GetTrigger(void)
     return;
 }
 
+static void test_task_trigger(void)
+{
+    static const WCHAR task_name[] = { 'T','e','s','t','i','n','g',0 };
+    HRESULT hr;
+    ITask *task;
+    ITaskTrigger *trigger, *trigger2;
+    WORD count, idx;
+    DWORD ref;
+
+    hr = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask,
+                                    &IID_ITask, (IUnknown **)&task);
+    ok(hr == S_OK, "got %#x\n", hr);
+
+    count = 0xdead;
+    hr = ITask_GetTriggerCount(task, &count);
+    ok(hr == S_OK, "got %#x\n", hr);
+    ok(count == 0, "got %u\n", count);
+
+    hr = ITask_DeleteTrigger(task, 0);
+    ok(hr == SCHED_E_TRIGGER_NOT_FOUND, "got %#x\n", hr);
+
+    hr = ITask_GetTrigger(task, 0, &trigger);
+    ok(hr == SCHED_E_TRIGGER_NOT_FOUND, "got %#x\n", hr);
+
+    idx = 0xdead;
+    hr = ITask_CreateTrigger(task, &idx, &trigger);
+    ok(hr == S_OK, "got %#x\n", hr);
+    ok(idx == 0, "got %u\n", idx);
+
+    hr = ITask_GetTrigger(task, 0, &trigger2);
+    ok(hr == S_OK, "got %#x\n", hr);
+    ok(trigger != trigger2, "%p != %p\n", trigger, trigger2);
+
+    ref = ITaskTrigger_Release(trigger2);
+    ok(ref == 0, "got %u\n", ref);
+
+    ref = ITaskTrigger_Release(trigger);
+    ok(ref == 0, "got %u\n", ref);
+
+    count = 0xdead;
+    hr = ITask_GetTriggerCount(task, &count);
+    ok(hr == S_OK, "got %#x\n", hr);
+    ok(count == 1, "got %u\n", count);
+
+    hr = ITask_DeleteTrigger(task, 0);
+    ok(hr == S_OK, "got %#x\n", hr);
+
+    idx = 0xdead;
+    hr = ITask_CreateTrigger(task, &idx, &trigger);
+    ok(hr == S_OK, "got %#x\n", hr);
+    ok(idx == 0, "got %u\n", idx);
+
+    hr = ITask_DeleteTrigger(task, 0);
+    ok(hr == S_OK, "got %#x\n", hr);
+
+    count = 0xdead;
+    hr = ITask_GetTriggerCount(task, &count);
+    ok(hr == S_OK, "got %#x\n", hr);
+    ok(count == 0, "got %u\n", count);
+
+    ref = ITaskTrigger_Release(trigger);
+    ok(ref == 0, "got %u\n", ref);
+
+    ref = ITask_Release(task);
+    ok(ref == 0, "got %u\n", ref);
+}
 
 START_TEST(task_trigger)
 {
+    HRESULT hr;
+
     CoInitialize(NULL);
+
+    hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER,
+                          &IID_ITaskScheduler, (void **)&test_task_scheduler);
+    ok(hr == S_OK, "error creating TaskScheduler instance %#x\n", hr);
+
     test_SetTrigger_GetTrigger();
+    test_task_trigger();
+
+    ITaskScheduler_Release(test_task_scheduler);
     CoUninitialize();
 }