diff --git a/util/test/demos/d3d11/d3d11_test.cpp b/util/test/demos/d3d11/d3d11_test.cpp
index a2bafe867..904d06ba2 100644
--- a/util/test/demos/d3d11/d3d11_test.cpp
+++ b/util/test/demos/d3d11/d3d11_test.cpp
@@ -152,25 +152,27 @@ bool D3D11GraphicsTest::Init(int argc, char **argv)
     }
   }
 
+  UINT flags = createFlags | (debugDevice ? D3D11_CREATE_DEVICE_DEBUG : 0);
+
   if(headless)
   {
-    hr = dyn_D3D11CreateDevice(adapter, driver, NULL, debugDevice ? D3D11_CREATE_DEVICE_DEBUG : 0,
-                               features, 1, D3D11_SDK_VERSION, &dev, NULL, &ctx);
+    hr = dyn_D3D11CreateDevice(adapter, driver, NULL, flags, features, 1, D3D11_SDK_VERSION, &dev,
+                               NULL, &ctx);
 
     // if it failed but on a high feature level, try again on warp
     if(FAILED(hr) && features[0] != D3D_FEATURE_LEVEL_11_0)
     {
       driver = D3D_DRIVER_TYPE_WARP;
-      hr = dyn_D3D11CreateDevice(adapter, driver, NULL, debugDevice ? D3D11_CREATE_DEVICE_DEBUG : 0,
-                                 features, 1, D3D11_SDK_VERSION, &dev, NULL, &ctx);
+      hr = dyn_D3D11CreateDevice(adapter, driver, NULL, flags, features, 1, D3D11_SDK_VERSION, &dev,
+                                 NULL, &ctx);
     }
 
     // if it failed again on a high feature level, try last on ref
     if(FAILED(hr) && features[0] != D3D_FEATURE_LEVEL_11_0)
     {
       driver = D3D_DRIVER_TYPE_REFERENCE;
-      hr = dyn_D3D11CreateDevice(adapter, driver, NULL, debugDevice ? D3D11_CREATE_DEVICE_DEBUG : 0,
-                                 features, 1, D3D11_SDK_VERSION, &dev, NULL, &ctx);
+      hr = dyn_D3D11CreateDevice(adapter, driver, NULL, flags, features, 1, D3D11_SDK_VERSION, &dev,
+                                 NULL, &ctx);
     }
 
     if(FAILED(hr))
@@ -202,16 +204,14 @@ bool D3D11GraphicsTest::Init(int argc, char **argv)
   swapDesc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD;
   swapDesc.Flags = 0;
 
-  hr = dyn_D3D11CreateDeviceAndSwapChain(adapter, driver, NULL,
-                                         debugDevice ? D3D11_CREATE_DEVICE_DEBUG : 0, features, 1,
+  hr = dyn_D3D11CreateDeviceAndSwapChain(adapter, driver, NULL, flags, features, 1,
                                          D3D11_SDK_VERSION, &swapDesc, &swap, &dev, NULL, &ctx);
 
   // if it failed but on a high feature level, try again on warp
   if(FAILED(hr))
   {
     driver = D3D_DRIVER_TYPE_WARP;
-    hr = dyn_D3D11CreateDeviceAndSwapChain(adapter, driver, NULL,
-                                           debugDevice ? D3D11_CREATE_DEVICE_DEBUG : 0, features, 1,
+    hr = dyn_D3D11CreateDeviceAndSwapChain(adapter, driver, NULL, flags, features, 1,
                                            D3D11_SDK_VERSION, &swapDesc, &swap, &dev, NULL, &ctx);
   }
 
@@ -219,8 +219,7 @@ bool D3D11GraphicsTest::Init(int argc, char **argv)
   if(FAILED(hr))
   {
     driver = D3D_DRIVER_TYPE_REFERENCE;
-    hr = dyn_D3D11CreateDeviceAndSwapChain(adapter, driver, NULL,
-                                           debugDevice ? D3D11_CREATE_DEVICE_DEBUG : 0, features, 1,
+    hr = dyn_D3D11CreateDeviceAndSwapChain(adapter, driver, NULL, flags, features, 1,
                                            D3D11_SDK_VERSION, &swapDesc, &swap, &dev, NULL, &ctx);
   }
 
diff --git a/util/test/demos/d3d11/d3d11_test.h b/util/test/demos/d3d11/d3d11_test.h
index 77acf2aa9..7403e61d3 100644
--- a/util/test/demos/d3d11/d3d11_test.h
+++ b/util/test/demos/d3d11/d3d11_test.h
@@ -154,6 +154,7 @@ struct D3D11GraphicsTest : public GraphicsTest
   int backbufferMSAA = 1;
   bool d3d11_1 = false;
   bool d3d11_2 = false;
+  UINT createFlags = 0;
 
   D3D11_FEATURE_DATA_D3D11_OPTIONS opts;
   D3D11_FEATURE_DATA_D3D11_OPTIONS1 opts1;