diff --git a/modules/rostests/apitests/gdi32/CreateDIBPatternBrush.c b/modules/rostests/apitests/gdi32/CreateDIBPatternBrush.c
index 490a5789a33..2ad7dcdda0f 100644
--- a/modules/rostests/apitests/gdi32/CreateDIBPatternBrush.c
+++ b/modules/rostests/apitests/gdi32/CreateDIBPatternBrush.c
@@ -180,7 +180,7 @@ void Test_CreateDIBPatternBrushPt_RLE8()
 
 START_TEST(CreateDIBPatternBrush)
 {
-    GdiToolsInit();
+    ok(GdiToolsInit(), "GdiToolsInit failed\n");
 
     Test_CreateDIBPatternBrush();
     Test_CreateDIBPatternBrushPt();
diff --git a/modules/rostests/apitests/gdi32/CreateDIBitmap.c b/modules/rostests/apitests/gdi32/CreateDIBitmap.c
index 62ac6265f62..5c487ffe29a 100644
--- a/modules/rostests/apitests/gdi32/CreateDIBitmap.c
+++ b/modules/rostests/apitests/gdi32/CreateDIBitmap.c
@@ -534,7 +534,8 @@ Test_CreateDIBitmap_CBM_CREATDIB(void)
 
 START_TEST(CreateDIBitmap)
 {
-    GdiToolsInit();
+    ok(GdiToolsInit(), "GdiToolsInit failed\n");
+
     Test_CreateDIBitmap_Params();
     Test_CreateDIBitmap1();
     Test_CreateDIBitmap_DIB_PAL_COLORS();
diff --git a/modules/rostests/apitests/gdi32/FrameRgn.c b/modules/rostests/apitests/gdi32/FrameRgn.c
index 3d40f68d609..43212086072 100644
--- a/modules/rostests/apitests/gdi32/FrameRgn.c
+++ b/modules/rostests/apitests/gdi32/FrameRgn.c
@@ -137,6 +137,7 @@ void Test_FrameRgn()
 
 START_TEST(FrameRgn)
 {
-    GdiToolsInit();
+    ok(GdiToolsInit(), "GdiToolsInit failed\n");
+
     Test_FrameRgn();
 }
diff --git a/modules/rostests/apitests/gdi32/GetDIBits.c b/modules/rostests/apitests/gdi32/GetDIBits.c
index 439cb4a19d3..7fe057a3911 100644
--- a/modules/rostests/apitests/gdi32/GetDIBits.c
+++ b/modules/rostests/apitests/gdi32/GetDIBits.c
@@ -472,8 +472,8 @@ void Test_GetDIBits_BI_BITFIELDS()
 
 START_TEST(GetDIBits)
 {
-    //getchar();
-    GdiToolsInit();
+    ok(GdiToolsInit(), "GdiToolsInit failed\n");
+
     Test_GetDIBits_xBpp(1);
     Test_GetDIBits_xBpp(4);
     Test_GetDIBits_xBpp(8);
diff --git a/modules/rostests/apitests/gdi32/MaskBlt.c b/modules/rostests/apitests/gdi32/MaskBlt.c
index fb75b125b24..e9fa05cebf7 100644
--- a/modules/rostests/apitests/gdi32/MaskBlt.c
+++ b/modules/rostests/apitests/gdi32/MaskBlt.c
@@ -293,7 +293,8 @@ void Test_MaskBlt_Brush()
 
 START_TEST(MaskBlt)
 {
-    GdiToolsInit();
+    ok(GdiToolsInit(), "GdiToolsInit failed\n");
+
     Test_MaskBlt_1bpp();
     Test_MaskBlt_16bpp();
     Test_MaskBlt_32bpp();
diff --git a/modules/rostests/apitests/gdi32/PaintRgn.c b/modules/rostests/apitests/gdi32/PaintRgn.c
index 4c89ddf0646..282ab56ff82 100644
--- a/modules/rostests/apitests/gdi32/PaintRgn.c
+++ b/modules/rostests/apitests/gdi32/PaintRgn.c
@@ -55,6 +55,7 @@ void Test_PaintRgn()
 
 START_TEST(PaintRgn)
 {
-    GdiToolsInit();
+    ok(GdiToolsInit(), "GdiToolsInit failed\n");
+
     Test_PaintRgn();
 }
diff --git a/modules/rostests/apitests/gdi32/RealizePalette.c b/modules/rostests/apitests/gdi32/RealizePalette.c
index 7b3eab5cd20..896581915ca 100644
--- a/modules/rostests/apitests/gdi32/RealizePalette.c
+++ b/modules/rostests/apitests/gdi32/RealizePalette.c
@@ -11,10 +11,10 @@
 
 START_TEST(RealizePalette)
 {
-    GdiToolsInit();
+    ok(GdiToolsInit(), "GdiToolsInit failed\n");
+
     ok_int(RealizePalette(NULL), GDI_ERROR);
     ok_int(RealizePalette((HDC)UlongToHandle(0xdeadc0de)), GDI_ERROR);
     ok_int(RealizePalette((HDC)UlongToHandle(0x00010001)), 0);
     ok_int(RealizePalette(ghdcDIB32), 0);
-
 }
diff --git a/modules/rostests/apitests/gdi32/SetDIBitsToDevice.c b/modules/rostests/apitests/gdi32/SetDIBitsToDevice.c
index 23c0e230196..8077f460341 100644
--- a/modules/rostests/apitests/gdi32/SetDIBitsToDevice.c
+++ b/modules/rostests/apitests/gdi32/SetDIBitsToDevice.c
@@ -687,7 +687,7 @@ Test_SetDIBitsToDevice()
 
 START_TEST(SetDIBitsToDevice)
 {
-    GdiToolsInit();
+    ok(GdiToolsInit(), "GdiToolsInit failed\n");
 
     Test_SetDIBitsToDevice_Params();
     Test_SetDIBitsToDevice();