diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 0f845295bf0..15256626a9b 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -3381,7 +3381,7 @@ static void test_surface_lock(void)
         if (tests[i].caps & DDSCAPS_ZBUFFER)
         {
             ddsd.dwFlags |= DDSD_ZBUFFERBITDEPTH;
-            ddsd.dwZBufferBitDepth = z_depth;
+            U2(ddsd).dwZBufferBitDepth = z_depth;
         }
         ddsd.ddsCaps.dwCaps = tests[i].caps;
 
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index f4702f1a8d0..7ff607536a7 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -4041,7 +4041,7 @@ static void test_surface_lock(void)
         if (tests[i].caps & DDSCAPS_ZBUFFER)
         {
             ddsd.dwFlags |= DDSD_ZBUFFERBITDEPTH;
-            ddsd.dwZBufferBitDepth = z_depth;
+            U2(ddsd).dwZBufferBitDepth = z_depth;
         }
         ddsd.ddsCaps.dwCaps = tests[i].caps;
 
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 61a54bb407c..ac885b47d64 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -4665,7 +4665,7 @@ static void test_surface_lock(void)
         if (tests[i].caps & DDSCAPS_ZBUFFER)
         {
             ddsd.dwFlags |= DDSD_PIXELFORMAT;
-            ddsd.ddpfPixelFormat = z_fmt;
+            U4(ddsd).ddpfPixelFormat = z_fmt;
         }
         ddsd.ddsCaps.dwCaps = tests[i].caps;
         ddsd.ddsCaps.dwCaps2 = tests[i].caps2;
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 44a68c45c0d..c4a6acba055 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -4551,7 +4551,7 @@ static void test_surface_lock(void)
         if (tests[i].caps & DDSCAPS_ZBUFFER)
         {
             ddsd.dwFlags |= DDSD_PIXELFORMAT;
-            ddsd.ddpfPixelFormat = z_fmt;
+            U4(ddsd).ddpfPixelFormat = z_fmt;
         }
         ddsd.ddsCaps.dwCaps = tests[i].caps;
         ddsd.ddsCaps.dwCaps2 = tests[i].caps2;