diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
index 97c2747e124..c831748a98f 100644
--- a/dlls/d3d8/tests/device.c
+++ b/dlls/d3d8/tests/device.c
@@ -6000,164 +6000,98 @@ static void test_set_palette(void)
     DestroyWindow(window);
 }
 
-static void test_swvp_buffer(void)
+static void test_pinned_buffers(void)
 {
-    IDirect3DDevice8 *device;
-    IDirect3D8 *d3d8;
-    UINT refcount;
-    HWND window;
-    HRESULT hr;
-    unsigned int i;
-    IDirect3DVertexBuffer8 *buffer;
-    static const unsigned int bufsize = 1024;
-    D3DVERTEXBUFFER_DESC desc;
-    struct device_desc device_desc;
-    struct
+    static const struct
     {
-        float x, y, z;
-    } *ptr, *ptr2;
-
-    window = create_window();
-    d3d8 = Direct3DCreate8(D3D_SDK_VERSION);
-    ok(!!d3d8, "Failed to create a D3D object.\n");
-
-    device_desc.device_window = window;
-    device_desc.width = 640;
-    device_desc.height = 480;
-    device_desc.flags = CREATE_DEVICE_SWVP_ONLY;
-    if (!(device = create_device(d3d8, window, &device_desc)))
-    {
-        skip("Failed to create a D3D device, skipping tests.\n");
-        IDirect3D8_Release(d3d8);
-        DestroyWindow(window);
-        return;
+        DWORD device_flags;
+        DWORD usage;
+        D3DPOOL pool;
     }
-
-    hr = IDirect3DDevice8_CreateVertexBuffer(device, bufsize * sizeof(*ptr), D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, 0,
-            D3DPOOL_DEFAULT, &buffer);
-    ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr);
-    hr = IDirect3DVertexBuffer8_GetDesc(buffer, &desc);
-    ok(SUCCEEDED(hr), "Failed to get desc, hr %#x.\n", hr);
-    ok(desc.Pool == D3DPOOL_DEFAULT, "Got pool %u, expected D3DPOOL_DEFAULT\n", desc.Pool);
-    ok(desc.Usage == (D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY),
-            "Got usage %u, expected D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY\n", desc.Usage);
-
-    hr = IDirect3DVertexBuffer8_Lock(buffer, 0, bufsize * sizeof(*ptr), (BYTE **)&ptr, D3DLOCK_DISCARD);
-    ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr);
-    for (i = 0; i < bufsize; i++)
+    tests[] =
     {
-        ptr[i].x = i * 1.0f;
-        ptr[i].y = i * 2.0f;
-        ptr[i].z = i * 3.0f;
-    }
-    hr = IDirect3DVertexBuffer8_Unlock(buffer);
-    ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr);
-
-    hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ);
-    ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr);
-    hr = IDirect3DDevice8_SetStreamSource(device, 0, buffer, sizeof(*ptr));
-    ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr);
-    hr = IDirect3DDevice8_BeginScene(device);
-    ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr);
-    hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 2);
-    ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr);
-    hr = IDirect3DDevice8_EndScene(device);
-    ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
-
-    hr = IDirect3DVertexBuffer8_Lock(buffer, 0, bufsize * sizeof(*ptr2), (BYTE **)&ptr2, D3DLOCK_DISCARD);
-    ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr);
-    ok(ptr == ptr2, "Lock returned two different pointers: %p, %p\n", ptr, ptr2);
-    for (i = 0; i < bufsize; i++)
-    {
-        if (ptr2[i].x != i * 1.0f || ptr2[i].y != i * 2.0f || ptr2[i].z != i * 3.0f)
-        {
-            ok(FALSE, "Vertex %u is %f,%f,%f, expected %f,%f,%f\n", i,
-                    ptr2[i].x, ptr2[i].y, ptr2[i].z, i * 1.0f, i * 2.0f, i * 3.0f);
-            break;
-        }
-    }
-    hr = IDirect3DVertexBuffer8_Unlock(buffer);
-    ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr);
-
-    IDirect3DVertexBuffer8_Release(buffer);
-    refcount = IDirect3DDevice8_Release(device);
-    ok(!refcount, "Device has %u references left.\n", refcount);
-    IDirect3D8_Release(d3d8);
-    DestroyWindow(window);
-}
-
-static void test_managed_buffer(void)
-{
+        {CREATE_DEVICE_SWVP_ONLY, D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, D3DPOOL_DEFAULT},
+        {0, 0, D3DPOOL_MANAGED},
+        {0, 0, D3DPOOL_SYSTEMMEM},
+    };
     static const unsigned int vertex_count = 1024;
+    struct device_desc device_desc;
     IDirect3DVertexBuffer8 *buffer;
     D3DVERTEXBUFFER_DESC desc;
     IDirect3DDevice8 *device;
     struct vec3 *ptr, *ptr2;
-    IDirect3D8 *d3d8;
-    unsigned int i;
+    unsigned int i, test;
+    IDirect3D8 *d3d;
     UINT refcount;
     HWND window;
     HRESULT hr;
 
     window = create_window();
-    d3d8 = Direct3DCreate8(D3D_SDK_VERSION);
-    ok(!!d3d8, "Failed to create a D3D object.\n");
-    if (!(device = create_device(d3d8, window, NULL)))
+    d3d = Direct3DCreate8(D3D_SDK_VERSION);
+    ok(!!d3d, "Failed to create a D3D object.\n");
+
+    for (test = 0; test < ARRAY_SIZE(tests); ++test)
     {
-        skip("Failed to create a D3D device, skipping tests.\n");
-        IDirect3D8_Release(d3d8);
-        DestroyWindow(window);
-        return;
-    }
-
-    hr = IDirect3DDevice8_CreateVertexBuffer(device, vertex_count * sizeof(*ptr), 0, 0, D3DPOOL_MANAGED, &buffer);
-    ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr);
-    hr = IDirect3DVertexBuffer8_GetDesc(buffer, &desc);
-    ok(SUCCEEDED(hr), "Failed to get desc, hr %#x.\n", hr);
-    ok(desc.Pool == D3DPOOL_MANAGED, "Got unexpected pool %#x.\n", desc.Pool);
-    ok(!desc.Usage, "Got unexpected usage %#x.\n", desc.Usage);
-
-    hr = IDirect3DVertexBuffer8_Lock(buffer, 0, vertex_count * sizeof(*ptr), (BYTE **)&ptr, D3DLOCK_DISCARD);
-    ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr);
-    for (i = 0; i < vertex_count; ++i)
-    {
-        ptr[i].x = i * 1.0f;
-        ptr[i].y = i * 2.0f;
-        ptr[i].z = i * 3.0f;
-    }
-    hr = IDirect3DVertexBuffer8_Unlock(buffer);
-    ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr);
-
-    hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ);
-    ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr);
-    hr = IDirect3DDevice8_SetStreamSource(device, 0, buffer, sizeof(*ptr));
-    ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr);
-    hr = IDirect3DDevice8_BeginScene(device);
-    ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr);
-    hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 2);
-    ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr);
-    hr = IDirect3DDevice8_EndScene(device);
-    ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
-
-    hr = IDirect3DVertexBuffer8_Lock(buffer, 0, vertex_count * sizeof(*ptr2), (BYTE **)&ptr2, D3DLOCK_DISCARD);
-    ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr);
-    ok(ptr2 == ptr, "Got unexpected ptr2 %p, expected %p.\n", ptr2, ptr);
-    for (i = 0; i < vertex_count; ++i)
-    {
-        if (ptr2[i].x != i * 1.0f || ptr2[i].y != i * 2.0f || ptr2[i].z != i * 3.0f)
+        device_desc.device_window = window;
+        device_desc.width = 640;
+        device_desc.height = 480;
+        device_desc.flags = tests[test].device_flags;
+        if (!(device = create_device(d3d, window, &device_desc)))
         {
-            ok(FALSE, "Got unexpected vertex %u {%.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e}.\n",
-                    i, ptr2[i].x, ptr2[i].y, ptr2[i].z, i * 1.0f, i * 2.0f, i * 3.0f);
-            break;
+            skip("Test %u: failed to create a D3D device.\n", test);
+            continue;
         }
-    }
-    hr = IDirect3DVertexBuffer8_Unlock(buffer);
-    ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr);
 
-    IDirect3DVertexBuffer8_Release(buffer);
-    refcount = IDirect3DDevice8_Release(device);
-    ok(!refcount, "Device has %u references left.\n", refcount);
-    IDirect3D8_Release(d3d8);
+        hr = IDirect3DDevice8_CreateVertexBuffer(device, vertex_count * sizeof(*ptr),
+                tests[test].usage, 0, tests[test].pool, &buffer);
+        ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr);
+        hr = IDirect3DVertexBuffer8_GetDesc(buffer, &desc);
+        ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr);
+        ok(desc.Pool == tests[test].pool, "Test %u: got unexpected pool %#x.\n", test, desc.Pool);
+        ok(desc.Usage == tests[test].usage, "Test %u: got unexpected usage %#x.\n", test, desc.Usage);
+
+        hr = IDirect3DVertexBuffer8_Lock(buffer, 0, vertex_count * sizeof(*ptr), (BYTE **)&ptr, D3DLOCK_DISCARD);
+        ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr);
+        for (i = 0; i < vertex_count; ++i)
+        {
+            ptr[i].x = i * 1.0f;
+            ptr[i].y = i * 2.0f;
+            ptr[i].z = i * 3.0f;
+        }
+        hr = IDirect3DVertexBuffer8_Unlock(buffer);
+        ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr);
+
+        hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ);
+        ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr);
+        hr = IDirect3DDevice8_SetStreamSource(device, 0, buffer, sizeof(*ptr));
+        ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr);
+        hr = IDirect3DDevice8_BeginScene(device);
+        ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr);
+        hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 2);
+        ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr);
+        hr = IDirect3DDevice8_EndScene(device);
+        ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr);
+
+        hr = IDirect3DVertexBuffer8_Lock(buffer, 0, vertex_count * sizeof(*ptr2), (BYTE **)&ptr2, D3DLOCK_DISCARD);
+        ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr);
+        ok(ptr2 == ptr, "Test %u: got unexpected ptr2 %p, expected %p.\n", test, ptr2, ptr);
+        for (i = 0; i < vertex_count; ++i)
+        {
+            if (ptr2[i].x != i * 1.0f || ptr2[i].y != i * 2.0f || ptr2[i].z != i * 3.0f)
+            {
+                ok(FALSE, "Test %u: got unexpected vertex %u {%.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e}.\n",
+                        test, i, ptr2[i].x, ptr2[i].y, ptr2[i].z, i * 1.0f, i * 2.0f, i * 3.0f);
+                break;
+            }
+        }
+        hr = IDirect3DVertexBuffer8_Unlock(buffer);
+        ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr);
+
+        IDirect3DVertexBuffer8_Release(buffer);
+        refcount = IDirect3DDevice8_Release(device);
+        ok(!refcount, "Test %u: device has %u references left.\n", test, refcount);
+    }
+    IDirect3D8_Release(d3d);
     DestroyWindow(window);
 }
 
@@ -9584,8 +9518,7 @@ START_TEST(device)
     test_surface_double_unlock();
     test_surface_blocks();
     test_set_palette();
-    test_swvp_buffer();
-    test_managed_buffer();
+    test_pinned_buffers();
     test_npot_textures();
     test_volume_locking();
     test_update_volumetexture();