diff --git a/.gitignore b/.gitignore
index 72a2fdb9710..f3206c6f153 100644
--- a/.gitignore
+++ b/.gitignore
@@ -296,6 +296,7 @@ programs/winetest/msacm32_test.exe
 programs/winetest/mscms_test.exe
 programs/winetest/mshtml_test.exe
 programs/winetest/msi_test.exe
+programs/winetest/mstask_test.exe
 programs/winetest/msvcrt_test.exe
 programs/winetest/msvcrtd_test.exe
 programs/winetest/msxml3_test.exe
diff --git a/Makefile.in b/Makefile.in
index 3cd9452ec10..8d197792808 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -353,6 +353,7 @@ ALL_MAKEFILES = \
 	dlls/msrle32/Makefile \
 	dlls/mssip32/Makefile \
 	dlls/mstask/Makefile \
+	dlls/mstask/tests/Makefile \
 	dlls/msvcirt/Makefile \
 	dlls/msvcr71/Makefile \
 	dlls/msvcrt/Makefile \
@@ -787,6 +788,7 @@ dlls/msnet32/Makefile: dlls/msnet32/Makefile.in dlls/Makedll.rules
 dlls/msrle32/Makefile: dlls/msrle32/Makefile.in dlls/Makedll.rules
 dlls/mssip32/Makefile: dlls/mssip32/Makefile.in dlls/Makedll.rules
 dlls/mstask/Makefile: dlls/mstask/Makefile.in dlls/Makedll.rules
+dlls/mstask/tests/Makefile: dlls/mstask/tests/Makefile.in dlls/Maketest.rules
 dlls/msvcirt/Makefile: dlls/msvcirt/Makefile.in dlls/Makedll.rules
 dlls/msvcr71/Makefile: dlls/msvcr71/Makefile.in dlls/Makedll.rules
 dlls/msvcrt/Makefile: dlls/msvcrt/Makefile.in dlls/Makedll.rules
diff --git a/configure b/configure
index 76d3fc0fea1..5a191c9abaf 100755
--- a/configure
+++ b/configure
@@ -22285,6 +22285,8 @@ ac_config_files="$ac_config_files dlls/mssip32/Makefile"
 
 ac_config_files="$ac_config_files dlls/mstask/Makefile"
 
+ac_config_files="$ac_config_files dlls/mstask/tests/Makefile"
+
 ac_config_files="$ac_config_files dlls/msvcirt/Makefile"
 
 ac_config_files="$ac_config_files dlls/msvcr71/Makefile"
@@ -23502,6 +23504,7 @@ do
     "dlls/msrle32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msrle32/Makefile" ;;
     "dlls/mssip32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mssip32/Makefile" ;;
     "dlls/mstask/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mstask/Makefile" ;;
+    "dlls/mstask/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mstask/tests/Makefile" ;;
     "dlls/msvcirt/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvcirt/Makefile" ;;
     "dlls/msvcr71/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvcr71/Makefile" ;;
     "dlls/msvcrt/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvcrt/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index 4ea3a18def1..bc2d1184fe5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1905,6 +1905,7 @@ AC_CONFIG_FILES([dlls/msnet32/Makefile])
 AC_CONFIG_FILES([dlls/msrle32/Makefile])
 AC_CONFIG_FILES([dlls/mssip32/Makefile])
 AC_CONFIG_FILES([dlls/mstask/Makefile])
+AC_CONFIG_FILES([dlls/mstask/tests/Makefile])
 AC_CONFIG_FILES([dlls/msvcirt/Makefile])
 AC_CONFIG_FILES([dlls/msvcr71/Makefile])
 AC_CONFIG_FILES([dlls/msvcrt/Makefile])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index b7428fb0e3c..581276c167e 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -330,6 +330,7 @@ TESTSUBDIRS = \
 	mscms/tests \
 	mshtml/tests \
 	msi/tests \
+	mstask/tests \
 	msvcrt/tests \
 	msvcrtd/tests \
 	msxml3/tests \
diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in
index 5ab9840f6bc..9defc7c83dc 100644
--- a/programs/winetest/Makefile.in
+++ b/programs/winetest/Makefile.in
@@ -65,6 +65,7 @@ TESTBINS = \
 	mscms_test.exe \
 	mshtml_test.exe \
 	msi_test.exe \
+	mstask_test.exe \
 	msvcrt_test.exe \
 	msvcrtd_test.exe \
 	msxml3_test.exe \
@@ -190,6 +191,8 @@ mshtml_test.exe: $(DLLDIR)/mshtml/tests/mshtml_test.exe$(DLLEXT)
 	cp $(DLLDIR)/mshtml/tests/mshtml_test.exe$(DLLEXT) $@ && $(STRIP) $@
 msi_test.exe: $(DLLDIR)/msi/tests/msi_test.exe$(DLLEXT)
 	cp $(DLLDIR)/msi/tests/msi_test.exe$(DLLEXT) $@ && $(STRIP) $@
+mstask_test.exe: $(DLLDIR)/mstask/tests/mstask_test.exe$(DLLEXT)
+	cp $(DLLDIR)/mstask/tests/mstask_test.exe$(DLLEXT) $@ && $(STRIP) $@
 msvcrt_test.exe: $(DLLDIR)/msvcrt/tests/msvcrt_test.exe$(DLLEXT)
 	cp $(DLLDIR)/msvcrt/tests/msvcrt_test.exe$(DLLEXT) $@ && $(STRIP) $@
 msvcrtd_test.exe: $(DLLDIR)/msvcrtd/tests/msvcrtd_test.exe$(DLLEXT)
diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc
index 1a2ba33632a..fb00c504a0c 100644
--- a/programs/winetest/winetest.rc
+++ b/programs/winetest/winetest.rc
@@ -126,6 +126,7 @@ msacm32_test.exe TESTRES "msacm32_test.exe"
 mscms_test.exe TESTRES "mscms_test.exe"
 mshtml_test.exe TESTRES "mshtml_test.exe"
 msi_test.exe TESTRES "msi_test.exe"
+mstask_test.exe TESTRES "mstask_test.exe"
 msvcrt_test.exe TESTRES "msvcrt_test.exe"
 msvcrtd_test.exe TESTRES "msvcrtd_test.exe"
 msxml3_test.exe TESTRES "msxml3_test.exe"