diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 7d97ec63559..ba7589b4da8 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -4080,7 +4080,8 @@ static void test_primary_palette(void)
     hr = IDirectDraw_SetDisplayMode(ddraw, 640, 480, 8);
     if (hr == E_NOTIMPL)
     {
-        win_skip("8bpp display mode is not supported\n");
+        win_skip("changing display mode is not supported (8bpp)\n");
+        IDirectDraw_Release(ddraw);
         DestroyWindow(window);
         return;
     }
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index ea9fc5ccfe6..f46c5156e71 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -5177,7 +5177,8 @@ static void test_primary_palette(void)
     hr = IDirectDraw2_SetDisplayMode(ddraw, 640, 480, 8, 0, 0);
     if (hr == E_NOTIMPL)
     {
-        win_skip("8bpp display mode is not supported\n");
+        win_skip("changing display mode is not supported (8bpp)\n");
+        IDirectDraw2_Release(ddraw);
         DestroyWindow(window);
         return;
     }
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index c768a95a177..d5f9e7e5839 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -5771,13 +5771,14 @@ static void test_primary_palette(void)
     window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
             0, 0, 640, 480, 0, 0, 0, 0);
     hr = IDirectDraw4_SetDisplayMode(ddraw, 640, 480, 8, 0, 0);
-    ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr);
     if (hr == E_NOTIMPL)
     {
-        win_skip("8bpp display mode is not supported\n");
+        win_skip("changing display mode is not supported (8bpp)\n");
+        IDirectDraw4_Release(ddraw);
         DestroyWindow(window);
         return;
     }
+    ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr);
     hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN);
     ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);