diff --git a/patches/comctl32-Tests/0001-comctl32-tests-Prevent-a-possible-nullpointer-derefe.patch b/patches/comctl32-Tests/0001-comctl32-tests-Prevent-a-possible-nullpointer-derefe.patch
new file mode 100644
index 00000000..bd1d8c99
--- /dev/null
+++ b/patches/comctl32-Tests/0001-comctl32-tests-Prevent-a-possible-nullpointer-derefe.patch
@@ -0,0 +1,28 @@
+From d18171f54de2c85d345a76586bd4672929cdbdb3 Mon Sep 17 00:00:00 2001
+From: Mark Jansen <learn0more+wine@gmail.com>
+Date: Sun, 11 Jun 2017 12:58:28 +0200
+Subject: comctl32/tests: Prevent a possible nullpointer dereference.
+
+---
+ dlls/comctl32/tests/imagelist.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c
+index 20be1ea02f2..0978b3d69d3 100644
+--- a/dlls/comctl32/tests/imagelist.c
++++ b/dlls/comctl32/tests/imagelist.c
+@@ -2042,9 +2042,9 @@ static void check_color_table(const char *name, HDC hdc, HIMAGELIST himl, UINT i
+         ok((bmi->bmiColors[i].rgbRed == expect[i].rgbRed &&
+             bmi->bmiColors[i].rgbGreen == expect[i].rgbGreen &&
+             bmi->bmiColors[i].rgbBlue == expect[i].rgbBlue) ||
+-           broken(bmi->bmiColors[i].rgbRed == broken_expect[i].rgbRed &&
++           (broken_expect && broken(bmi->bmiColors[i].rgbRed == broken_expect[i].rgbRed &&
+                   bmi->bmiColors[i].rgbGreen == broken_expect[i].rgbGreen &&
+-                  bmi->bmiColors[i].rgbBlue == broken_expect[i].rgbBlue),
++                  bmi->bmiColors[i].rgbBlue == broken_expect[i].rgbBlue)),
+            "%d: %s: got color[%d] %02x %02x %02x expect %02x %02x %02x\n", depth, name, i,
+            bmi->bmiColors[i].rgbRed, bmi->bmiColors[i].rgbGreen, bmi->bmiColors[i].rgbBlue,
+            expect[i].rgbRed, expect[i].rgbGreen, expect[i].rgbBlue);
+-- 
+2.13.1
+
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 304c81fd..c5363187 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -102,6 +102,7 @@ patch_enable_all ()
 	enable_comctl32_Button_Theming="$1"
 	enable_comctl32_Listview_DrawItem="$1"
 	enable_comctl32_TTM_ADDTOOLW="$1"
+	enable_comctl32_Tests="$1"
 	enable_comdlg32_lpstrFileTitle="$1"
 	enable_configure_Absolute_RPATH="$1"
 	enable_crypt32_CMS_Certificates="$1"
@@ -546,6 +547,9 @@ patch_enable ()
 		comctl32-TTM_ADDTOOLW)
 			enable_comctl32_TTM_ADDTOOLW="$2"
 			;;
+		comctl32-Tests)
+			enable_comctl32_Tests="$2"
+			;;
 		comdlg32-lpstrFileTitle)
 			enable_comdlg32_lpstrFileTitle="$2"
 			;;
@@ -3343,6 +3347,18 @@ if test "$enable_comctl32_TTM_ADDTOOLW" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset comctl32-Tests
+# |
+# | Modified files:
+# |   *	dlls/comctl32/tests/imagelist.c
+# |
+if test "$enable_comctl32_Tests" -eq 1; then
+	patch_apply comctl32-Tests/0001-comctl32-tests-Prevent-a-possible-nullpointer-derefe.patch
+	(
+		printf '%s\n' '+    { "Mark Jansen", "comctl32/tests: Prevent a possible nullpointer dereference.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset comdlg32-lpstrFileTitle
 # |
 # | This patchset fixes the following Wine bugs: