diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 4f146e62a..7308cc670 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -9,21 +9,24 @@ if(ANDROID)
 	target_link_libraries(tests_main PUBLIC log)
 endif()
 
-foreach(
-	testname
-	tests_cxx_wrappers
-	tests_generic_callbacks
-	tests_history_buf
-	tests_id_ringbuffer
-	tests_input_transform
-	tests_json
-	tests_lowpass_float
-	tests_lowpass_integer
-	tests_pacing
-	tests_quatexpmap
-	tests_rational
-	tests_worker
+set(tests
+    tests_cxx_wrappers
+    tests_generic_callbacks
+    tests_history_buf
+    tests_id_ringbuffer
+    tests_input_transform
+    tests_json
+    tests_lowpass_float
+    tests_lowpass_integer
+    tests_pacing
+    tests_quatexpmap
+    tests_rational
+    tests_worker
 	)
+if(XRT_HAVE_D3D11)
+	list(APPEND tests tests_aux_d3d)
+endif()
+foreach(testname ${tests})
 
 	add_executable(${testname} ${testname}.cpp)
 	target_link_libraries(${testname} PRIVATE tests_main)
@@ -40,3 +43,7 @@ target_link_libraries(tests_lowpass_float PRIVATE aux_math)
 target_link_libraries(tests_lowpass_integer PRIVATE aux_math)
 target_link_libraries(tests_quatexpmap PRIVATE aux_math)
 target_link_libraries(tests_rational PRIVATE aux_math)
+
+if(XRT_HAVE_D3D11)
+	target_link_libraries(tests_aux_d3d PRIVATE aux_d3d)
+endif()
diff --git a/tests/tests_aux_d3d.cpp b/tests/tests_aux_d3d.cpp
new file mode 100644
index 000000000..0336b9e61
--- /dev/null
+++ b/tests/tests_aux_d3d.cpp
@@ -0,0 +1,159 @@
+// Copyright 2022, Collabora, Ltd.
+// SPDX-License-Identifier: BSL-1.0
+/*!
+ * @file
+ * @brief Direct3D 11 tests.
+ * @author Ryan Pavlik <ryan.pavlik@collabora.com>
+ */
+
+#include <iostream>
+
+#include "catch/catch.hpp"
+
+#include <d3d/d3d_helpers.hpp>
+#include <d3d/d3d_d3d11_allocator.hpp>
+#include <util/u_win32_com_guard.hpp>
+
+#include <d3d11_4.h>
+
+using namespace xrt::auxiliary::d3d;
+using namespace xrt::auxiliary::util;
+
+TEST_CASE("dxgi_adapter", "[.][needgpu]")
+{
+	ComGuard comGuard;
+	wil::com_ptr<IDXGIAdapter> adapter;
+
+	CHECK_NOTHROW(adapter = getAdapterByIndex(0, U_LOGGING_TRACE));
+	CHECK(adapter);
+	auto adapter1 = adapter.query<IDXGIAdapter1>();
+	DXGI_ADAPTER_DESC1 desc{};
+	REQUIRE(SUCCEEDED(adapter1->GetDesc1(&desc)));
+
+	xrt_luid_t luid{};
+	memcpy(&luid, &(desc.AdapterLuid), sizeof(luid));
+
+
+	wil::com_ptr<IDXGIAdapter> adapterFromLuid;
+	CHECK_NOTHROW(adapterFromLuid = getAdapterByLUID(luid, U_LOGGING_TRACE));
+	CHECK(adapterFromLuid);
+}
+
+TEST_CASE("d3d11_device", "[.][needgpu]")
+{
+	ComGuard comGuard;
+	wil::com_ptr<IDXGIAdapter> adapter;
+
+	CHECK_NOTHROW(adapter = getAdapterByIndex(0, U_LOGGING_TRACE));
+	CHECK(adapter);
+	wil::com_ptr<ID3D11Device> device;
+	wil::com_ptr<ID3D11DeviceContext> context;
+	CHECK_NOTHROW(std::tie(device, context) = createD3D11Device(adapter, U_LOGGING_TRACE));
+	CHECK(device);
+	CHECK(context);
+}
+static constexpr std::initializer_list<DXGI_FORMAT> colorFormats = {
+    DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, DXGI_FORMAT_B8G8R8A8_UNORM,     DXGI_FORMAT_R16G16B16A16_FLOAT,
+    DXGI_FORMAT_R16G16B16A16_UNORM,  DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_FORMAT_R16G16B16A16_UNORM,
+    DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM,
+};
+
+static constexpr std::initializer_list<DXGI_FORMAT> depthStencilFormats = {
+    DXGI_FORMAT_D16_UNORM,
+    DXGI_FORMAT_D24_UNORM_S8_UINT,
+    DXGI_FORMAT_D32_FLOAT_S8X24_UINT,
+    DXGI_FORMAT_D32_FLOAT,
+};
+static constexpr std::initializer_list<DXGI_FORMAT> formats = {
+    DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, DXGI_FORMAT_B8G8R8A8_UNORM,       DXGI_FORMAT_R16G16B16A16_FLOAT,
+    DXGI_FORMAT_R16G16B16A16_UNORM,  DXGI_FORMAT_R16G16B16A16_FLOAT,   DXGI_FORMAT_R16G16B16A16_UNORM,
+    DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM,       DXGI_FORMAT_D16_UNORM,
+    DXGI_FORMAT_D24_UNORM_S8_UINT,   DXGI_FORMAT_D32_FLOAT_S8X24_UINT, DXGI_FORMAT_D32_FLOAT,
+};
+
+static inline bool
+isDepthStencilFormat(DXGI_FORMAT format)
+{
+	const auto b = depthStencilFormats.begin();
+	const auto e = depthStencilFormats.end();
+	auto it = std::find(b, e, format);
+	return it != e;
+}
+TEST_CASE("d3d11_allocate", "[.][needgpu]")
+{
+	ComGuard comGuard;
+	wil::com_ptr<IDXGIAdapter> adapter;
+
+	CHECK_NOTHROW(adapter = getAdapterByIndex(0, U_LOGGING_TRACE));
+	wil::com_ptr<ID3D11Device> device;
+	wil::com_ptr<ID3D11DeviceContext> context;
+	CHECK_NOTHROW(std::tie(device, context) = createD3D11Device(adapter, U_LOGGING_TRACE));
+	auto device5 = device.query<ID3D11Device5>();
+	std::vector<wil::com_ptr<ID3D11Texture2D1>> images;
+	std::vector<wil::unique_handle> handles;
+
+	static constexpr bool kKeyedMutex = true;
+	size_t imageCount = 3;
+
+	xrt_swapchain_create_info xsci{};
+	xsci.sample_count = 1;
+	xsci.width = 800;
+	xsci.height = 600;
+	xsci.face_count = 1;
+	xsci.array_size = 1;
+	xsci.mip_count = 1;
+	SECTION("create images")
+	{
+		auto format = GENERATE(values(colorFormats));
+		if (isDepthStencilFormat(format)) {
+
+			xsci.bits = XRT_SWAPCHAIN_USAGE_DEPTH_STENCIL;
+		} else {
+			xsci.bits = XRT_SWAPCHAIN_USAGE_COLOR;
+		}
+		xsci.bits = (xrt_swapchain_usage_bits)(xsci.bits | XRT_SWAPCHAIN_USAGE_SAMPLED);
+
+		INFO("Format: " << format) xsci.format = format;
+		images.clear();
+		handles.clear();
+		SECTION("invalid array size 0")
+		{
+			xsci.array_size = 0;
+			CHECK(XRT_SUCCESS !=
+			      allocateSharedImages(*device5, xsci, imageCount, kKeyedMutex, images, handles));
+			CHECK(images.empty());
+			CHECK(handles.empty());
+		}
+		SECTION("not array")
+		{
+			CHECK(XRT_SUCCESS ==
+			      allocateSharedImages(*device5, xsci, imageCount, kKeyedMutex, images, handles));
+			CHECK(images.size() == imageCount);
+			CHECK(handles.size() == imageCount);
+		}
+		SECTION("array of 2")
+		{
+			xsci.array_size = 2;
+			CHECK(XRT_SUCCESS ==
+			      allocateSharedImages(*device5, xsci, imageCount, kKeyedMutex, images, handles));
+			CHECK(images.size() == imageCount);
+			CHECK(handles.size() == imageCount);
+		}
+		SECTION("cubemaps not implemented")
+		{
+			xsci.face_count = 6;
+			CHECK(XRT_ERROR_ALLOCATION ==
+			      allocateSharedImages(*device5, xsci, imageCount, kKeyedMutex, images, handles));
+			CHECK(images.empty());
+			CHECK(handles.empty());
+		}
+		SECTION("protected content not implemented")
+		{
+			xsci.create = XRT_SWAPCHAIN_CREATE_PROTECTED_CONTENT;
+			CHECK(XRT_ERROR_SWAPCHAIN_FLAG_VALID_BUT_UNSUPPORTED ==
+			      allocateSharedImages(*device5, xsci, imageCount, kKeyedMutex, images, handles));
+			CHECK(images.empty());
+			CHECK(handles.empty());
+		}
+	}
+}