diff --git a/.gitignore b/.gitignore
index 5b87ab44f3a..9a36041a7aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,14 +10,16 @@
 /tags
 /wine
 Makefile
-dlls/*/tests/*.ok
-dlls/*/tests/testlist.c
 dlls/Makedll.rules
 dlls/Makeimplib.rules
 dlls/Maketest.rules
 dlls/activeds/libactiveds.def
 dlls/advapi32/libadvapi32.def
+dlls/advapi32/tests/*.ok
+dlls/advapi32/tests/testlist.c
 dlls/advpack/libadvpack.def
+dlls/advpack/tests/*.ok
+dlls/advpack/tests/testlist.c
 dlls/amstream/version.res
 dlls/atl/atliface.h
 dlls/atl/libatl.def
@@ -28,6 +30,8 @@ dlls/avifil32/rsrc.res
 dlls/avifile.dll16
 dlls/cabinet/cabinet.res
 dlls/cabinet/libcabinet.def
+dlls/cabinet/tests/*.ok
+dlls/cabinet/tests/testlist.c
 dlls/capi2032/libcapi2032.def
 dlls/cards/b1fv.bmp
 dlls/cards/b2fv.bmp
@@ -91,6 +95,8 @@ dlls/cards/thex.bmp
 dlls/cards/version.res
 dlls/cfgmgr32/libcfgmgr32.def
 dlls/clusapi/libclusapi.def
+dlls/comcat/tests/*.ok
+dlls/comcat/tests/testlist.c
 dlls/comcat/version.res
 dlls/comctl32/idb_hist_large.bmp
 dlls/comctl32/idb_hist_small.bmp
@@ -109,9 +115,11 @@ dlls/comctl32/idi_tt_warn_sm.ico
 dlls/comctl32/idt_check.bmp
 dlls/comctl32/libcomctl32.def
 dlls/comctl32/rsrc.res
+dlls/comctl32/tests/*.ok
 dlls/comctl32/tests/bmp128x15.bmp
 dlls/comctl32/tests/bmp80x15.bmp
 dlls/comctl32/tests/rsrc.res
+dlls/comctl32/tests/testlist.c
 dlls/comdlg32/800.bmp
 dlls/comdlg32/cdrom.ico
 dlls/comdlg32/floppy.ico
@@ -126,6 +134,8 @@ dlls/comdlg32/pd32_landscape.ico
 dlls/comdlg32/pd32_nocollate.ico
 dlls/comdlg32/pd32_portrait.ico
 dlls/comdlg32/rsrc.res
+dlls/comdlg32/tests/*.ok
+dlls/comdlg32/tests/testlist.c
 dlls/comm.drv16
 dlls/commdlg.dll16
 dlls/compobj.dll16
@@ -133,13 +143,19 @@ dlls/compstui/libcompstui.def
 dlls/crtdll/libcrtdll.def
 dlls/crypt32/crypt32.res
 dlls/crypt32/libcrypt32.def
+dlls/crypt32/tests/*.ok
+dlls/crypt32/tests/testlist.c
 dlls/cryptdll/libcryptdll.def
 dlls/ctl3d.dll16
 dlls/ctl3d32/libctl3d32.def
 dlls/ctl3dv2.dll16
 dlls/d3d8/libd3d8.def
+dlls/d3d8/tests/*.ok
+dlls/d3d8/tests/testlist.c
 dlls/d3d8/version.res
 dlls/d3d9/libd3d9.def
+dlls/d3d9/tests/*.ok
+dlls/d3d9/tests/testlist.c
 dlls/d3d9/version.res
 dlls/d3dim/libd3dim.def
 dlls/d3dim/version.res
@@ -152,9 +168,13 @@ dlls/dbghelp/libdbghelp.def
 dlls/dciman32/libdciman32.def
 dlls/ddeml.dll16
 dlls/ddraw/libddraw.def
+dlls/ddraw/tests/*.ok
+dlls/ddraw/tests/testlist.c
 dlls/ddraw/version.res
 dlls/devenum/devenum.res
 dlls/dinput/libdinput.def
+dlls/dinput/tests/*.ok
+dlls/dinput/tests/testlist.c
 dlls/dinput/version.res
 dlls/dinput8/libdinput8.def
 dlls/dinput8/version.res
@@ -171,6 +191,8 @@ dlls/dmusic/version.res
 dlls/dmusic32/libdmusic32.def
 dlls/dmusic32/version.res
 dlls/dnsapi/libdnsapi.def
+dlls/dnsapi/tests/*.ok
+dlls/dnsapi/tests/testlist.c
 dlls/dplay/libdplay.def
 dlls/dplay/version.res
 dlls/dplayx/libdplayx.def
@@ -179,11 +201,15 @@ dlls/dpnet/libdpnet.def
 dlls/dpnet/version.res
 dlls/dpnhpast/version.res
 dlls/dsound/libdsound.def
+dlls/dsound/tests/*.ok
+dlls/dsound/tests/testlist.c
 dlls/dsound/version.res
 dlls/dswave/version.res
 dlls/dxdiagn/version.res
 dlls/gdi.exe16
 dlls/gdi32/libgdi32.def
+dlls/gdi32/tests/*.ok
+dlls/gdi32/tests/testlist.c
 dlls/gdi32/version.res
 dlls/gdi32/version16.res
 dlls/glu32/libglu32.def
@@ -192,30 +218,48 @@ dlls/hhctrl.ocx/hhctrl.res
 dlls/hid/libhid.def
 dlls/hid/version.res
 dlls/hlink/libhlink.def
+dlls/hlink/tests/*.ok
+dlls/hlink/tests/testlist.c
 dlls/iccvid/rsrc.res
 dlls/icmp/libicmp.def
 dlls/imagehlp/libimagehlp.def
 dlls/imm.dll16
 dlls/imm32/libimm32.def
+dlls/infosoft/tests/*.ok
+dlls/infosoft/tests/testlist.c
 dlls/iphlpapi/libiphlpapi.def
+dlls/iphlpapi/tests/*.ok
+dlls/iphlpapi/tests/testlist.c
 dlls/itss/rsrc.res
+dlls/itss/tests/*.ok
 dlls/itss/tests/data.chm
 dlls/itss/tests/rsrc.res
+dlls/itss/tests/testlist.c
 dlls/kernel32/kernel.res
 dlls/kernel32/libkernel32.def
 dlls/kernel32/nls/winerr_deu.mc.rc
 dlls/kernel32/nls/winerr_enu.mc.rc
 dlls/kernel32/nls/winerr_kor.mc.rc
+dlls/kernel32/tests/*.ok
+dlls/kernel32/tests/testlist.c
 dlls/kernel32/version16.res
 dlls/keyboard.drv16
 dlls/krnl386.exe16
 dlls/libwinspool.def
 dlls/localspl/localspl.res
+dlls/localspl/tests/*.ok
+dlls/localspl/tests/testlist.c
 dlls/lz32/liblz32.def
+dlls/lz32/tests/*.ok
+dlls/lz32/tests/testlist.c
 dlls/lzexpand.dll16
 dlls/mapi32/libmapi32.def
+dlls/mapi32/tests/*.ok
+dlls/mapi32/tests/testlist.c
 dlls/mciavi32/mciavi_res.res
 dlls/mlang/libmlang.def
+dlls/mlang/tests/*.ok
+dlls/mlang/tests/testlist.c
 dlls/mmsystem.dll16
 dlls/mouse.drv16
 dlls/mpr/libmpr.def
@@ -224,13 +268,19 @@ dlls/mprapi/libmprapi.def
 dlls/msacm.dll16
 dlls/msacm32/libmsacm32.def
 dlls/msacm32/msacm.res
+dlls/msacm32/tests/*.ok
+dlls/msacm32/tests/testlist.c
 dlls/mscms/libmscms.def
+dlls/mscms/tests/*.ok
+dlls/mscms/tests/testlist.c
 dlls/mscms/version.res
 dlls/msdmo/libmsdmo.def
 dlls/msdmo/rsrc.res
 dlls/mshtml/libmshtml.def
 dlls/mshtml/nsiface.h
 dlls/mshtml/rsrc.res
+dlls/mshtml/tests/*.ok
+dlls/mshtml/tests/testlist.c
 dlls/msi/cond.tab.c
 dlls/msi/cond.tab.h
 dlls/msi/instabsent.bmp
@@ -240,24 +290,36 @@ dlls/msi/libmsi.def
 dlls/msi/msi.res
 dlls/msi/sql.tab.c
 dlls/msi/sql.tab.h
+dlls/msi/tests/*.ok
+dlls/msi/tests/testlist.c
 dlls/msimg32/libmsimg32.def
 dlls/msrle32/rsrc.res
 dlls/msvcrt/libmsvcrt.def
 dlls/msvcrt/rsrc.res
+dlls/msvcrt/tests/*.ok
+dlls/msvcrt/tests/testlist.c
 dlls/msvcrt20/libmsvcrt20.def
 dlls/msvcrt40/libmsvcrt40.def
 dlls/msvcrtd/libmsvcrtd.def
+dlls/msvcrtd/tests/*.ok
+dlls/msvcrtd/tests/testlist.c
 dlls/msvfw32/libmsvfw32.def
 dlls/msvfw32/rsrc.res
 dlls/msvidc32/rsrc.res
 dlls/msvideo.dll16
 dlls/mswsock/libmswsock.def
 dlls/mswsock/version.res
+dlls/msxml3/tests/*.ok
+dlls/msxml3/tests/testlist.c
 dlls/msxml3/version.res
 dlls/nddeapi/libnddeapi.def
 dlls/netapi32/libnetapi32.def
+dlls/netapi32/tests/*.ok
+dlls/netapi32/tests/testlist.c
 dlls/newdev/libnewdev.def
 dlls/ntdll/libntdll.def
+dlls/ntdll/tests/*.ok
+dlls/ntdll/tests/testlist.c
 dlls/ntdsapi/libntdsapi.def
 dlls/objsel/objsel.res
 dlls/odbc32/libodbc32.def
@@ -275,9 +337,13 @@ dlls/ole32/drag_move.cur
 dlls/ole32/libole32.def
 dlls/ole32/nodrop.cur
 dlls/ole32/ole32res.res
+dlls/ole32/tests/*.ok
+dlls/ole32/tests/testlist.c
 dlls/oleacc/liboleacc.def
 dlls/oleaut32/liboleaut32.def
 dlls/oleaut32/oleaut32.res
+dlls/oleaut32/tests/*.ok
+dlls/oleaut32/tests/testlist.c
 dlls/olecli.dll16
 dlls/olecli32/libolecli32.def
 dlls/oledlg/liboledlg.def
@@ -290,30 +356,48 @@ dlls/opengl32/libopengl32.def
 dlls/opengl32/version.res
 dlls/powrprof/libpowrprof.def
 dlls/psapi/libpsapi.def
+dlls/psapi/tests/*.ok
+dlls/psapi/tests/testlist.c
 dlls/qcap/version.res
 dlls/quartz/libquartz.def
+dlls/quartz/tests/*.ok
+dlls/quartz/tests/testlist.c
 dlls/quartz/version.res
 dlls/rasapi16.dll16
 dlls/rasapi32/librasapi32.def
 dlls/resutils/libresutils.def
 dlls/riched20/libriched20.def
+dlls/riched20/tests/*.ok
+dlls/riched20/tests/testlist.c
 dlls/riched20/version.res
 dlls/riched32/version.res
 dlls/rpcrt4/librpcrt4.def
+dlls/rpcrt4/tests/*.ok
+dlls/rpcrt4/tests/testlist.c
+dlls/rsabase/tests/*.ok
+dlls/rsabase/tests/testlist.c
 dlls/rsaenh/librsaenh.def
+dlls/rsaenh/tests/*.ok
+dlls/rsaenh/tests/testlist.c
 dlls/sane.ds/rsrc.res
 dlls/secur32/libsecur32.def
+dlls/secur32/tests/*.ok
+dlls/secur32/tests/testlist.c
 dlls/sensapi/libsensapi.def
 dlls/serialui/libserialui.def
 dlls/serialui/serialui_rc.res
 dlls/setupapi/libsetupapi.def
 dlls/setupapi/setupapi.res
+dlls/setupapi/tests/*.ok
+dlls/setupapi/tests/testlist.c
 dlls/setupx.dll16
 dlls/sfc/libsfc.def
 dlls/shdoclc/rsrc.res
 dlls/shdocvw/libshdocvw.def
 dlls/shdocvw/shdocvw.res
 dlls/shdocvw/shdocvw_v1.tlb
+dlls/shdocvw/tests/*.ok
+dlls/shdocvw/tests/testlist.c
 dlls/shell.dll16
 dlls/shell32/cdrom.ico
 dlls/shell32/delete.ico
@@ -333,12 +417,16 @@ dlls/shell32/ramdisk.ico
 dlls/shell32/searching.avi
 dlls/shell32/shortcut.ico
 dlls/shell32/shres.res
+dlls/shell32/tests/*.ok
+dlls/shell32/tests/testlist.c
 dlls/shell32/trash_file.ico
 dlls/shell32/version16.res
 dlls/shfolder/libshfolder.def
 dlls/shfolder/version.res
 dlls/shlwapi/libshlwapi.def
 dlls/shlwapi/shlwapi.res
+dlls/shlwapi/tests/*.ok
+dlls/shlwapi/tests/testlist.c
 dlls/snmpapi/libsnmpapi.def
 dlls/sound.drv16
 dlls/stdole2.tlb/rsrc.res
@@ -357,6 +445,8 @@ dlls/unicows/libunicows.def
 dlls/url/liburl.def
 dlls/urlmon/liburlmon.def
 dlls/urlmon/rsrc.res
+dlls/urlmon/tests/*.ok
+dlls/urlmon/tests/testlist.c
 dlls/user.exe16
 dlls/user32/libuser32.def
 dlls/user32/resources/display.res
@@ -421,14 +511,22 @@ dlls/user32/resources/oic_sample.ico
 dlls/user32/resources/oic_winlogo.ico
 dlls/user32/resources/user32.res
 dlls/user32/resources/version16.res
+dlls/user32/tests/*.ok
 dlls/user32/tests/resource.res
 dlls/user32/tests/test_mono.bmp
+dlls/user32/tests/testlist.c
 dlls/usp10/libusp10.def
+dlls/usp10/tests/*.ok
+dlls/usp10/tests/testlist.c
 dlls/uxtheme/libuxtheme.def
+dlls/uxtheme/tests/*.ok
+dlls/uxtheme/tests/testlist.c
 dlls/uxtheme/version.res
 dlls/vdmdbg/libvdmdbg.def
 dlls/ver.dll16
 dlls/version/libversion.def
+dlls/version/tests/*.ok
+dlls/version/tests/testlist.c
 dlls/version/tests/version.res
 dlls/w32sys.dll16
 dlls/win32s16.dll16
@@ -442,17 +540,25 @@ dlls/wineps16.drv16
 dlls/wing.dll16
 dlls/wininet/libwininet.def
 dlls/wininet/rsrc.res
+dlls/wininet/tests/*.ok
+dlls/wininet/tests/testlist.c
 dlls/wininet/version.res
 dlls/winmm/libwinmm.def
+dlls/winmm/tests/*.ok
+dlls/winmm/tests/testlist.c
 dlls/winmm/winmm_res.res
 dlls/winnls.dll16
 dlls/winnls32/libwinnls32.def
 dlls/winsock.dll16
 dlls/winspool.drv/libwinspool.def
+dlls/winspool.drv/tests/*.ok
+dlls/winspool.drv/tests/testlist.c
 dlls/winspool.drv/winspool.res
 dlls/wintab.dll16
 dlls/wintab32/libwintab32.def
 dlls/wintrust/libwintrust.def
+dlls/wintrust/tests/*.ok
+dlls/wintrust/tests/testlist.c
 dlls/wintrust/version.res
 dlls/wldap32/libwldap32.def
 dlls/wldap32/wldap32.res
@@ -460,6 +566,8 @@ dlls/wnaspi32/libwnaspi32.def
 dlls/wow32/libwow32.def
 dlls/wprocs.dll16
 dlls/ws2_32/libws2_32.def
+dlls/ws2_32/tests/*.ok
+dlls/ws2_32/tests/testlist.c
 dlls/ws2_32/version.res
 dlls/wsock32/libwsock32.def
 dlls/wsock32/version.res
diff --git a/tools/make_makefiles b/tools/make_makefiles
index 4147ff972d6..d44632fb741 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -330,12 +330,7 @@ sub update_dlls(@)
 {
     my (%directories, %testdirs, %importlibs, %static_implibs, %staticlib_dirs, %altnames);
     my $text = "";
-
-    my @ignores =
-    (
-     "dlls/*/tests/testlist.c",
-     "dlls/*/tests/*.ok",
-    );
+    my @ignores = ();
 
     sub needs_symlink($$)
     {
@@ -346,12 +341,15 @@ sub update_dlls(@)
 
     foreach my $make (@_)
     {
+        my %makefile = %{$makefiles{$make}};
+
         if ($make =~ /dlls\/(.*)\/tests\/Makefile/)
         {
+            push @ignores, $makefile{"=dir"} . "testlist.c";
+            push @ignores, $makefile{"=dir"} . "*.ok";
             $testdirs{$1} = "$1/tests";
             next;
         }
-        my %makefile = %{$makefiles{$make}};
 
         next unless defined $makefile{"MODULE"};
         my $module = $makefile{"MODULE"};