diff --git a/dlls/.gitignore b/dlls/.gitignore
index ede9f25092e..4531555a3d8 100644
--- a/dlls/.gitignore
+++ b/dlls/.gitignore
@@ -1,4 +1,5 @@
 # Automatically generated by make_dlls; DO NOT EDIT!!
+*/tests/*.ok
 */tests/testlist.c
 /Makedll.rules
 /Makeimplib.rules
diff --git a/dlls/advapi32/tests/.gitignore b/dlls/advapi32/tests/.gitignore
deleted file mode 100644
index 87e4c103d56..00000000000
--- a/dlls/advapi32/tests/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/crypt.ok
-/crypt_lmhash.ok
-/crypt_md4.ok
-/crypt_md5.ok
-/crypt_sha.ok
-/lsa.ok
-/registry.ok
-/security.ok
diff --git a/dlls/advpack/tests/.gitignore b/dlls/advpack/tests/.gitignore
deleted file mode 100644
index 4b191de409d..00000000000
--- a/dlls/advpack/tests/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/advpack.ok
-/files.ok
-/install.ok
diff --git a/dlls/cabinet/tests/.gitignore b/dlls/cabinet/tests/.gitignore
deleted file mode 100644
index 5be29469ab3..00000000000
--- a/dlls/cabinet/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/extract.ok
diff --git a/dlls/comctl32/tests/.gitignore b/dlls/comctl32/tests/.gitignore
index b14b3cd18a8..971db971ee9 100644
--- a/dlls/comctl32/tests/.gitignore
+++ b/dlls/comctl32/tests/.gitignore
@@ -1,16 +1 @@
-/comboex.ok
-/dpa.ok
-/header.ok
-/imagelist.ok
-/listview.ok
-/monthcal.ok
-/mru.ok
-/progress.ok
-/propsheet.ok
 /propsheet.res
-/subclass.ok
-/tab.ok
-/toolbar.ok
-/tooltips.ok
-/treeview.ok
-/updown.ok
diff --git a/dlls/comdlg32/tests/.gitignore b/dlls/comdlg32/tests/.gitignore
deleted file mode 100644
index e2c942894f2..00000000000
--- a/dlls/comdlg32/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/printdlg.ok
diff --git a/dlls/crypt32/tests/.gitignore b/dlls/crypt32/tests/.gitignore
deleted file mode 100644
index 66118bc6c0f..00000000000
--- a/dlls/crypt32/tests/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-/base64.ok
-/cert.ok
-/crl.ok
-/encode.ok
-/main.ok
-/oid.ok
-/protectdata.ok
-/store.ok
-/str.ok
diff --git a/dlls/d3d8/tests/.gitignore b/dlls/d3d8/tests/.gitignore
deleted file mode 100644
index dd04c853d06..00000000000
--- a/dlls/d3d8/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/device.ok
diff --git a/dlls/d3d9/tests/.gitignore b/dlls/d3d9/tests/.gitignore
deleted file mode 100644
index 76090ff9cfa..00000000000
--- a/dlls/d3d9/tests/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/device.ok
-/shader.ok
-/stateblock.ok
-/surface.ok
-/texture.ok
-/vertexdeclaration.ok
-/volume.ok
diff --git a/dlls/ddraw/tests/.gitignore b/dlls/ddraw/tests/.gitignore
deleted file mode 100644
index 1fc513ba408..00000000000
--- a/dlls/ddraw/tests/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/d3d.ok
-/ddrawmodes.ok
-/dsurface.ok
-/refcount.ok
diff --git a/dlls/dinput/tests/.gitignore b/dlls/dinput/tests/.gitignore
deleted file mode 100644
index 1fc4b031c71..00000000000
--- a/dlls/dinput/tests/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/joystick.ok
-/keyboard.ok
-/mouse.ok
diff --git a/dlls/dnsapi/tests/.gitignore b/dlls/dnsapi/tests/.gitignore
deleted file mode 100644
index fdf39459f79..00000000000
--- a/dlls/dnsapi/tests/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/name.ok
-/record.ok
diff --git a/dlls/dsound/tests/.gitignore b/dlls/dsound/tests/.gitignore
deleted file mode 100644
index f13b7f415d0..00000000000
--- a/dlls/dsound/tests/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/capture.ok
-/ds3d.ok
-/ds3d8.ok
-/dsound.ok
-/dsound8.ok
-/duplex.ok
-/propset.ok
diff --git a/dlls/gdi/tests/.gitignore b/dlls/gdi/tests/.gitignore
deleted file mode 100644
index 40c207d3b22..00000000000
--- a/dlls/gdi/tests/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-/bitmap.ok
-/brush.ok
-/clipping.ok
-/dc.ok
-/font.ok
-/gdiobj.ok
-/generated.ok
-/mapping.ok
-/metafile.ok
-/palette.ok
-/pen.ok
diff --git a/dlls/iphlpapi/tests/.gitignore b/dlls/iphlpapi/tests/.gitignore
deleted file mode 100644
index 3d6b045a880..00000000000
--- a/dlls/iphlpapi/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/iphlpapi.ok
diff --git a/dlls/kernel/tests/.gitignore b/dlls/kernel/tests/.gitignore
deleted file mode 100644
index d036ddc43f1..00000000000
--- a/dlls/kernel/tests/.gitignore
+++ /dev/null
@@ -1,28 +0,0 @@
-/alloc.ok
-/atom.ok
-/change.ok
-/codepage.ok
-/comm.ok
-/console.ok
-/directory.ok
-/drive.ok
-/environ.ok
-/file.ok
-/format_msg.ok
-/generated.ok
-/heap.ok
-/locale.ok
-/mailslot.ok
-/module.ok
-/path.ok
-/pipe.ok
-/process.ok
-/profile.ok
-/sync.ok
-/thread.ok
-/time.ok
-/timer.ok
-/toolhelp.ok
-/version.ok
-/virtual.ok
-/volume.ok
diff --git a/dlls/lz32/tests/.gitignore b/dlls/lz32/tests/.gitignore
deleted file mode 100644
index 15b36a0b9cb..00000000000
--- a/dlls/lz32/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lzexpand_main.ok
diff --git a/dlls/make_dlls b/dlls/make_dlls
index 7d5a732aa8d..9bd371096c5 100755
--- a/dlls/make_dlls
+++ b/dlls/make_dlls
@@ -364,6 +364,7 @@ my @ignores =
  "/Makeimplib.rules",
  "/Maketest.rules",
  "*/tests/testlist.c",
+ "*/tests/*.ok",
 );
 
 foreach my $mod (sort @lib_symlinks)
diff --git a/dlls/mapi32/tests/.gitignore b/dlls/mapi32/tests/.gitignore
deleted file mode 100644
index a8c2319a3cc..00000000000
--- a/dlls/mapi32/tests/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/imalloc.ok
-/prop.ok
-/util.ok
diff --git a/dlls/mlang/tests/.gitignore b/dlls/mlang/tests/.gitignore
deleted file mode 100644
index 0f0f94ba0fb..00000000000
--- a/dlls/mlang/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/mlang.ok
diff --git a/dlls/msacm32/tests/.gitignore b/dlls/msacm32/tests/.gitignore
deleted file mode 100644
index 721c831ba30..00000000000
--- a/dlls/msacm32/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/msacm.ok
diff --git a/dlls/mscms/tests/.gitignore b/dlls/mscms/tests/.gitignore
deleted file mode 100644
index ea483ef0af2..00000000000
--- a/dlls/mscms/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/profile.ok
diff --git a/dlls/mshtml/tests/.gitignore b/dlls/mshtml/tests/.gitignore
deleted file mode 100644
index fd059438280..00000000000
--- a/dlls/mshtml/tests/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/htmldoc.ok
-/misc.ok
-/protocol.ok
diff --git a/dlls/msi/tests/.gitignore b/dlls/msi/tests/.gitignore
deleted file mode 100644
index d317f863bc0..00000000000
--- a/dlls/msi/tests/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/db.ok
-/format.ok
-/install.ok
-/msi.ok
-/package.ok
-/record.ok
-/suminfo.ok
diff --git a/dlls/msvcrt/tests/.gitignore b/dlls/msvcrt/tests/.gitignore
deleted file mode 100644
index 03c5e70f7cf..00000000000
--- a/dlls/msvcrt/tests/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-/cpp.ok
-/data.ok
-/dir.ok
-/environ.ok
-/file.ok
-/headers.ok
-/heap.ok
-/printf.ok
-/scanf.ok
-/string.ok
-/time.ok
diff --git a/dlls/msvcrtd/tests/.gitignore b/dlls/msvcrtd/tests/.gitignore
deleted file mode 100644
index 4d2ede0b6c5..00000000000
--- a/dlls/msvcrtd/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/debug.ok
diff --git a/dlls/msxml3/tests/.gitignore b/dlls/msxml3/tests/.gitignore
deleted file mode 100644
index fb6238d30a2..00000000000
--- a/dlls/msxml3/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/domdoc.ok
diff --git a/dlls/netapi32/tests/.gitignore b/dlls/netapi32/tests/.gitignore
deleted file mode 100644
index 6ab4c03eeac..00000000000
--- a/dlls/netapi32/tests/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/access.ok
-/apibuf.ok
-/ds.ok
-/wksta.ok
diff --git a/dlls/ntdll/tests/.gitignore b/dlls/ntdll/tests/.gitignore
deleted file mode 100644
index 6b2df2fcb9e..00000000000
--- a/dlls/ntdll/tests/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-/atom.ok
-/change.ok
-/env.ok
-/error.ok
-/exception.ok
-/generated.ok
-/info.ok
-/large_int.ok
-/om.ok
-/path.ok
-/port.ok
-/reg.ok
-/rtl.ok
-/rtlbitmap.ok
-/rtlstr.ok
-/string.ok
-/time.ok
diff --git a/dlls/ole32/tests/.gitignore b/dlls/ole32/tests/.gitignore
deleted file mode 100644
index 3a14fc33a35..00000000000
--- a/dlls/ole32/tests/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/clipboard.ok
-/compobj.ok
-/marshal.ok
-/moniker.ok
-/propvariant.ok
-/stg_prop.ok
-/storage32.ok
diff --git a/dlls/oleaut32/tests/.gitignore b/dlls/oleaut32/tests/.gitignore
deleted file mode 100644
index cbae27753a5..00000000000
--- a/dlls/oleaut32/tests/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/olefont.ok
-/olepicture.ok
-/safearray.ok
-/typelib.ok
-/usrmarshal.ok
-/vartest.ok
-/vartype.ok
diff --git a/dlls/psapi/tests/.gitignore b/dlls/psapi/tests/.gitignore
deleted file mode 100644
index 9f632353970..00000000000
--- a/dlls/psapi/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/psapi_main.ok
diff --git a/dlls/quartz/tests/.gitignore b/dlls/quartz/tests/.gitignore
deleted file mode 100644
index 18fc11ef4be..00000000000
--- a/dlls/quartz/tests/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/filtergraph.ok
-/memallocator.ok
diff --git a/dlls/riched20/tests/.gitignore b/dlls/riched20/tests/.gitignore
deleted file mode 100644
index bfecf4f1c9a..00000000000
--- a/dlls/riched20/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/editor.ok
diff --git a/dlls/rpcrt4/tests/.gitignore b/dlls/rpcrt4/tests/.gitignore
deleted file mode 100644
index 7545049ec89..00000000000
--- a/dlls/rpcrt4/tests/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/generated.ok
-/ndr_marshall.ok
-/rpc.ok
diff --git a/dlls/rsabase/tests/.gitignore b/dlls/rsabase/tests/.gitignore
deleted file mode 100644
index 447c63908d5..00000000000
--- a/dlls/rsabase/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/rsabase.ok
diff --git a/dlls/rsaenh/tests/.gitignore b/dlls/rsaenh/tests/.gitignore
deleted file mode 100644
index 90c2b0c0926..00000000000
--- a/dlls/rsaenh/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/rsaenh.ok
diff --git a/dlls/secur32/tests/.gitignore b/dlls/secur32/tests/.gitignore
deleted file mode 100644
index bcbf7b72a85..00000000000
--- a/dlls/secur32/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/main.ok
diff --git a/dlls/setupapi/tests/.gitignore b/dlls/setupapi/tests/.gitignore
deleted file mode 100644
index a2fa97b1bb5..00000000000
--- a/dlls/setupapi/tests/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/devinst.ok
-/parser.ok
-/query.ok
-/stringtable.ok
diff --git a/dlls/shdocvw/tests/.gitignore b/dlls/shdocvw/tests/.gitignore
deleted file mode 100644
index d7bdba11a66..00000000000
--- a/dlls/shdocvw/tests/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/shortcut.ok
-/webbrowser.ok
diff --git a/dlls/shell32/tests/.gitignore b/dlls/shell32/tests/.gitignore
deleted file mode 100644
index 41668aa74f2..00000000000
--- a/dlls/shell32/tests/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/generated.ok
-/shelllink.ok
-/shellpath.ok
-/shlexec.ok
-/shlfileop.ok
-/shlfolder.ok
-/string.ok
diff --git a/dlls/shlwapi/tests/.gitignore b/dlls/shlwapi/tests/.gitignore
deleted file mode 100644
index 4feef46d560..00000000000
--- a/dlls/shlwapi/tests/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/clist.ok
-/clsid.ok
-/generated.ok
-/ordinal.ok
-/path.ok
-/shreg.ok
-/string.ok
diff --git a/dlls/urlmon/tests/.gitignore b/dlls/urlmon/tests/.gitignore
deleted file mode 100644
index 4c0c1dda1bc..00000000000
--- a/dlls/urlmon/tests/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/generated.ok
-/misc.ok
-/protocol.ok
-/url.ok
diff --git a/dlls/user/tests/.gitignore b/dlls/user/tests/.gitignore
index f8ee156e10b..ed930fe0d8d 100644
--- a/dlls/user/tests/.gitignore
+++ b/dlls/user/tests/.gitignore
@@ -1,20 +1,2 @@
-/class.ok
-/clipboard.ok
-/dce.ok
-/dde.ok
-/dialog.ok
-/edit.ok
-/generated.ok
-/input.ok
-/listbox.ok
-/menu.ok
-/monitor.ok
-/msg.ok
-/resource.ok
 /resource.res
-/sysparams.ok
 /test_mono.bmp
-/text.ok
-/win.ok
-/winstation.ok
-/wsprintf.ok
diff --git a/dlls/usp10/tests/.gitignore b/dlls/usp10/tests/.gitignore
deleted file mode 100644
index bddf0c8cf5d..00000000000
--- a/dlls/usp10/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/usp10.ok
diff --git a/dlls/uxtheme/tests/.gitignore b/dlls/uxtheme/tests/.gitignore
deleted file mode 100644
index 67733ff2fe6..00000000000
--- a/dlls/uxtheme/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/system.ok
diff --git a/dlls/version/tests/.gitignore b/dlls/version/tests/.gitignore
index b8ac662a557..7210776c86b 100644
--- a/dlls/version/tests/.gitignore
+++ b/dlls/version/tests/.gitignore
@@ -1,3 +1 @@
-/info.ok
-/install.ok
 /version.res
diff --git a/dlls/wininet/tests/.gitignore b/dlls/wininet/tests/.gitignore
deleted file mode 100644
index 2ec7890014d..00000000000
--- a/dlls/wininet/tests/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/generated.ok
-/http.ok
-/internet.ok
-/url.ok
diff --git a/dlls/winmm/tests/.gitignore b/dlls/winmm/tests/.gitignore
deleted file mode 100644
index 300e1535a09..00000000000
--- a/dlls/winmm/tests/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/capture.ok
-/mixer.ok
-/mmio.ok
-/timer.ok
-/wave.ok
diff --git a/dlls/winspool.drv/tests/.gitignore b/dlls/winspool.drv/tests/.gitignore
deleted file mode 100644
index 0314ce22fcf..00000000000
--- a/dlls/winspool.drv/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/info.ok
diff --git a/dlls/ws2_32/tests/.gitignore b/dlls/ws2_32/tests/.gitignore
deleted file mode 100644
index 663f8b0f0d4..00000000000
--- a/dlls/ws2_32/tests/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/protocol.ok
-/sock.ok