diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
index 451bf520..9017e805 100644
--- a/engine/CMakeLists.txt
+++ b/engine/CMakeLists.txt
@@ -292,3 +292,5 @@ if(MSVC)
 else()
     target_compile_options(XCEngine PRIVATE -Wall)
 endif()
+
+target_compile_definitions(XCEngine PRIVATE XCENGINE_SUPPORT_OPENGL)
diff --git a/engine/src/RHI/RHIFactory.cpp b/engine/src/RHI/RHIFactory.cpp
index 80106bfc..a2293b08 100644
--- a/engine/src/RHI/RHIFactory.cpp
+++ b/engine/src/RHI/RHIFactory.cpp
@@ -1,5 +1,8 @@
 #include "XCEngine/RHI/RHIFactory.h"
 #include "XCEngine/RHI/D3D12/D3D12Device.h"
+#ifdef XCENGINE_SUPPORT_OPENGL
+#include "XCEngine/RHI/OpenGL/OpenGLDevice.h"
+#endif
 
 namespace XCEngine {
 namespace RHI {
@@ -8,14 +11,9 @@ RHIDevice* RHIFactory::CreateRHIDevice(RHIType type) {
     switch (type) {
         case RHIType::D3D12:
             return new D3D12Device();
-        case RHIType::OpenGL:
 #ifdef XCENGINE_SUPPORT_OPENGL
-            {
-                #include "XCEngine/RHI/OpenGL/OpenGLDevice.h"
-                return new OpenGLDevice();
-            }
-#else
-            return nullptr;
+        case RHIType::OpenGL:
+            return new OpenGLDevice();
 #endif
         case RHIType::Vulkan:
         case RHIType::Metal:
@@ -27,12 +25,9 @@ RHIDevice* RHIFactory::CreateRHIDevice(RHIType type) {
 RHIDevice* RHIFactory::CreateRHIDevice(const std::string& typeName) {
     if (typeName == "D3D12" || typeName == "d3d12") {
         return new D3D12Device();
-    } else if (typeName == "OpenGL" || typeName == "opengl" || typeName == "GL") {
 #ifdef XCENGINE_SUPPORT_OPENGL
-        #include "XCEngine/RHI/OpenGL/OpenGLDevice.h"
+    } else if (typeName == "OpenGL" || typeName == "opengl" || typeName == "GL") {
         return new OpenGLDevice();
-#else
-        return nullptr;
 #endif
     }
     return nullptr;
diff --git a/tests/RHI/unit/CMakeLists.txt b/tests/RHI/unit/CMakeLists.txt
index 58fcc754..b5fa699f 100644
--- a/tests/RHI/unit/CMakeLists.txt
+++ b/tests/RHI/unit/CMakeLists.txt
@@ -15,10 +15,13 @@ set(TEST_SOURCES
     test_shader.cpp
     test_fence.cpp
     test_sampler.cpp
+    ${CMAKE_SOURCE_DIR}/tests/opengl/package/src/glad.c
 )
 
 add_executable(rhi_tests ${TEST_SOURCES})
 
+target_compile_definitions(rhi_tests PRIVATE XCENGINE_SUPPORT_OPENGL)
+
 target_link_libraries(rhi_tests PRIVATE
     d3d12
     dxgi
diff --git a/tests/RHI/unit/fixtures/RHITestFixture.cpp b/tests/RHI/unit/fixtures/RHITestFixture.cpp
index 7ad96d75..71731819 100644
--- a/tests/RHI/unit/fixtures/RHITestFixture.cpp
+++ b/tests/RHI/unit/fixtures/RHITestFixture.cpp
@@ -6,7 +6,8 @@
 namespace XCEngine {
 namespace RHI {
 
-RHIType RHITestFixture::mBackendType = RHIType::D3D12;
+INSTANTIATE_TEST_SUITE_P(D3D12, RHITestFixture, ::testing::Values(RHIType::D3D12));
+INSTANTIATE_TEST_SUITE_P(OpenGL, RHITestFixture, ::testing::Values(RHIType::OpenGL));
 
 void RHITestFixture::SetUpTestSuite() {
 }
@@ -15,7 +16,7 @@ void RHITestFixture::TearDownTestSuite() {
 }
 
 void RHITestFixture::SetUp() {
-    mDevice = RHIFactory::CreateRHIDevice(mBackendType);
+    mDevice = RHIFactory::CreateRHIDevice(GetParam());
     ASSERT_NE(mDevice, nullptr);
 
     WNDCLASSEXW wc = {};
diff --git a/tests/RHI/unit/fixtures/RHITestFixture.h b/tests/RHI/unit/fixtures/RHITestFixture.h
index 0a708ff3..5087f718 100644
--- a/tests/RHI/unit/fixtures/RHITestFixture.h
+++ b/tests/RHI/unit/fixtures/RHITestFixture.h
@@ -19,7 +19,7 @@
 namespace XCEngine {
 namespace RHI {
 
-class RHITestFixture : public ::testing::Test {
+class RHITestFixture : public ::testing::TestWithParam<RHIType> {
 protected:
     void SetUp() override;
     void TearDown() override;
@@ -28,10 +28,9 @@ protected:
     static void TearDownTestSuite();
 
     RHIDevice* GetDevice() { return mDevice; }
-    RHIType GetBackendType() const { return mBackendType; }
+    RHIType GetBackendType() const { return GetParam(); }
 
 private:
-    static RHIType mBackendType;
     RHIDevice* mDevice = nullptr;
 };
 
diff --git a/tests/RHI/unit/test_buffer.cpp b/tests/RHI/unit/test_buffer.cpp
index f162511b..898be9fc 100644
--- a/tests/RHI/unit/test_buffer.cpp
+++ b/tests/RHI/unit/test_buffer.cpp
@@ -3,7 +3,7 @@
 
 using namespace XCEngine::RHI;
 
-TEST_F(RHITestFixture, Buffer_Map_Unmap) {
+TEST_P(RHITestFixture, Buffer_Map_Unmap) {
     BufferDesc desc = {};
     desc.size = 256;
     desc.stride = sizeof(float);
@@ -22,7 +22,7 @@ TEST_F(RHITestFixture, Buffer_Map_Unmap) {
     delete buffer;
 }
 
-TEST_F(RHITestFixture, Buffer_SetData) {
+TEST_P(RHITestFixture, Buffer_SetData) {
     BufferDesc desc = {};
     desc.size = 128;
     desc.stride = sizeof(float);
@@ -38,7 +38,7 @@ TEST_F(RHITestFixture, Buffer_SetData) {
     delete buffer;
 }
 
-TEST_F(RHITestFixture, Buffer_GetSize) {
+TEST_P(RHITestFixture, Buffer_GetSize) {
     BufferDesc desc = {};
     desc.size = 1024;
     desc.stride = sizeof(float);
@@ -53,7 +53,7 @@ TEST_F(RHITestFixture, Buffer_GetSize) {
     delete buffer;
 }
 
-TEST_F(RHITestFixture, Buffer_GetStride) {
+TEST_P(RHITestFixture, Buffer_GetStride) {
     BufferDesc desc = {};
     desc.size = 256;
     desc.stride = 16;
@@ -68,7 +68,7 @@ TEST_F(RHITestFixture, Buffer_GetStride) {
     delete buffer;
 }
 
-TEST_F(RHITestFixture, Buffer_SetBufferType) {
+TEST_P(RHITestFixture, Buffer_SetBufferType) {
     BufferDesc desc = {};
     desc.size = 256;
     desc.stride = sizeof(float);
@@ -85,7 +85,7 @@ TEST_F(RHITestFixture, Buffer_SetBufferType) {
     delete buffer;
 }
 
-TEST_F(RHITestFixture, Buffer_StateManagement) {
+TEST_P(RHITestFixture, Buffer_StateManagement) {
     BufferDesc desc = {};
     desc.size = 256;
     desc.stride = sizeof(float);
@@ -102,7 +102,7 @@ TEST_F(RHITestFixture, Buffer_StateManagement) {
     delete buffer;
 }
 
-TEST_F(RHITestFixture, Buffer_Naming) {
+TEST_P(RHITestFixture, Buffer_Naming) {
     BufferDesc desc = {};
     desc.size = 256;
     desc.stride = sizeof(float);
@@ -118,7 +118,7 @@ TEST_F(RHITestFixture, Buffer_Naming) {
     delete buffer;
 }
 
-TEST_F(RHITestFixture, Buffer_GetNativeHandle) {
+TEST_P(RHITestFixture, Buffer_GetNativeHandle) {
     BufferDesc desc = {};
     desc.size = 256;
     desc.stride = sizeof(float);
diff --git a/tests/RHI/unit/test_command_list.cpp b/tests/RHI/unit/test_command_list.cpp
index 9ad50e2f..cb9308db 100644
--- a/tests/RHI/unit/test_command_list.cpp
+++ b/tests/RHI/unit/test_command_list.cpp
@@ -4,7 +4,7 @@
 
 using namespace XCEngine::RHI;
 
-TEST_F(RHITestFixture, CommandList_Reset_Close) {
+TEST_P(RHITestFixture, CommandList_Reset_Close) {
     CommandListDesc cmdDesc = {};
     cmdDesc.commandListType = static_cast<uint32_t>(CommandQueueType::Direct);
 
@@ -18,7 +18,7 @@ TEST_F(RHITestFixture, CommandList_Reset_Close) {
     delete cmdList;
 }
 
-TEST_F(RHITestFixture, CommandList_SetPrimitiveTopology) {
+TEST_P(RHITestFixture, CommandList_SetPrimitiveTopology) {
     CommandListDesc cmdDesc = {};
     cmdDesc.commandListType = static_cast<uint32_t>(CommandQueueType::Direct);
 
@@ -33,7 +33,7 @@ TEST_F(RHITestFixture, CommandList_SetPrimitiveTopology) {
     delete cmdList;
 }
 
-TEST_F(RHITestFixture, CommandList_SetViewport) {
+TEST_P(RHITestFixture, CommandList_SetViewport) {
     CommandListDesc cmdDesc = {};
     cmdDesc.commandListType = static_cast<uint32_t>(CommandQueueType::Direct);
 
@@ -50,7 +50,7 @@ TEST_F(RHITestFixture, CommandList_SetViewport) {
     delete cmdList;
 }
 
-TEST_F(RHITestFixture, CommandList_SetViewports) {
+TEST_P(RHITestFixture, CommandList_SetViewports) {
     CommandListDesc cmdDesc = {};
     cmdDesc.commandListType = static_cast<uint32_t>(CommandQueueType::Direct);
 
@@ -70,7 +70,7 @@ TEST_F(RHITestFixture, CommandList_SetViewports) {
     delete cmdList;
 }
 
-TEST_F(RHITestFixture, CommandList_SetScissorRect) {
+TEST_P(RHITestFixture, CommandList_SetScissorRect) {
     CommandListDesc cmdDesc = {};
     cmdDesc.commandListType = static_cast<uint32_t>(CommandQueueType::Direct);
 
@@ -87,7 +87,7 @@ TEST_F(RHITestFixture, CommandList_SetScissorRect) {
     delete cmdList;
 }
 
-TEST_F(RHITestFixture, CommandList_Draw) {
+TEST_P(RHITestFixture, CommandList_Draw) {
     CommandListDesc cmdDesc = {};
     cmdDesc.commandListType = static_cast<uint32_t>(CommandQueueType::Direct);
 
@@ -103,7 +103,7 @@ TEST_F(RHITestFixture, CommandList_Draw) {
     delete cmdList;
 }
 
-TEST_F(RHITestFixture, CommandList_DrawIndexed) {
+TEST_P(RHITestFixture, CommandList_DrawIndexed) {
     CommandListDesc cmdDesc = {};
     cmdDesc.commandListType = static_cast<uint32_t>(CommandQueueType::Direct);
 
@@ -119,7 +119,7 @@ TEST_F(RHITestFixture, CommandList_DrawIndexed) {
     delete cmdList;
 }
 
-TEST_F(RHITestFixture, CommandList_ClearRenderTarget) {
+TEST_P(RHITestFixture, CommandList_ClearRenderTarget) {
     CommandListDesc cmdDesc = {};
     cmdDesc.commandListType = static_cast<uint32_t>(CommandQueueType::Direct);
 
@@ -147,7 +147,7 @@ TEST_F(RHITestFixture, CommandList_ClearRenderTarget) {
     delete cmdList;
 }
 
-TEST_F(RHITestFixture, CommandList_SetDepthStencilState) {
+TEST_P(RHITestFixture, CommandList_SetDepthStencilState) {
     CommandListDesc cmdDesc = {};
     cmdDesc.commandListType = static_cast<uint32_t>(CommandQueueType::Direct);
 
@@ -167,7 +167,7 @@ TEST_F(RHITestFixture, CommandList_SetDepthStencilState) {
     delete cmdList;
 }
 
-TEST_F(RHITestFixture, CommandList_SetBlendState) {
+TEST_P(RHITestFixture, CommandList_SetBlendState) {
     CommandListDesc cmdDesc = {};
     cmdDesc.commandListType = static_cast<uint32_t>(CommandQueueType::Direct);
 
@@ -186,7 +186,7 @@ TEST_F(RHITestFixture, CommandList_SetBlendState) {
     delete cmdList;
 }
 
-TEST_F(RHITestFixture, CommandList_SetStencilRef) {
+TEST_P(RHITestFixture, CommandList_SetStencilRef) {
     CommandListDesc cmdDesc = {};
     cmdDesc.commandListType = static_cast<uint32_t>(CommandQueueType::Direct);
 
@@ -201,7 +201,7 @@ TEST_F(RHITestFixture, CommandList_SetStencilRef) {
     delete cmdList;
 }
 
-TEST_F(RHITestFixture, CommandList_TransitionBarrier) {
+TEST_P(RHITestFixture, CommandList_TransitionBarrier) {
     CommandListDesc cmdDesc = {};
     cmdDesc.commandListType = static_cast<uint32_t>(CommandQueueType::Direct);
 
diff --git a/tests/RHI/unit/test_command_queue.cpp b/tests/RHI/unit/test_command_queue.cpp
index d75f1c64..f4ca9525 100644
--- a/tests/RHI/unit/test_command_queue.cpp
+++ b/tests/RHI/unit/test_command_queue.cpp
@@ -5,7 +5,7 @@
 
 using namespace XCEngine::RHI;
 
-TEST_F(RHITestFixture, CommandQueue_ExecuteCommandLists) {
+TEST_P(RHITestFixture, CommandQueue_ExecuteCommandLists) {
     CommandQueueDesc queueDesc = {};
     queueDesc.queueType = static_cast<uint32_t>(CommandQueueType::Direct);
 
@@ -30,7 +30,7 @@ TEST_F(RHITestFixture, CommandQueue_ExecuteCommandLists) {
     delete queue;
 }
 
-TEST_F(RHITestFixture, CommandQueue_SignalWaitFence) {
+TEST_P(RHITestFixture, CommandQueue_SignalWaitFence) {
     CommandQueueDesc queueDesc = {};
     queueDesc.queueType = static_cast<uint32_t>(CommandQueueType::Direct);
 
@@ -54,7 +54,7 @@ TEST_F(RHITestFixture, CommandQueue_SignalWaitFence) {
     delete queue;
 }
 
-TEST_F(RHITestFixture, CommandQueue_GetCompletedValue) {
+TEST_P(RHITestFixture, CommandQueue_GetCompletedValue) {
     CommandQueueDesc queueDesc = {};
     queueDesc.queueType = static_cast<uint32_t>(CommandQueueType::Direct);
 
@@ -68,7 +68,7 @@ TEST_F(RHITestFixture, CommandQueue_GetCompletedValue) {
     delete queue;
 }
 
-TEST_F(RHITestFixture, CommandQueue_WaitForIdle) {
+TEST_P(RHITestFixture, CommandQueue_WaitForIdle) {
     CommandQueueDesc queueDesc = {};
     queueDesc.queueType = static_cast<uint32_t>(CommandQueueType::Direct);
 
@@ -81,7 +81,7 @@ TEST_F(RHITestFixture, CommandQueue_WaitForIdle) {
     delete queue;
 }
 
-TEST_F(RHITestFixture, CommandQueue_GetType) {
+TEST_P(RHITestFixture, CommandQueue_GetType) {
     CommandQueueDesc queueDesc = {};
     queueDesc.queueType = static_cast<uint32_t>(CommandQueueType::Direct);
 
@@ -94,7 +94,7 @@ TEST_F(RHITestFixture, CommandQueue_GetType) {
     delete queue;
 }
 
-TEST_F(RHITestFixture, CommandQueue_GetTimestampFrequency) {
+TEST_P(RHITestFixture, CommandQueue_GetTimestampFrequency) {
     CommandQueueDesc queueDesc = {};
     queueDesc.queueType = static_cast<uint32_t>(CommandQueueType::Direct);
 
diff --git a/tests/RHI/unit/test_device.cpp b/tests/RHI/unit/test_device.cpp
index da73b6a3..32fde7f4 100644
--- a/tests/RHI/unit/test_device.cpp
+++ b/tests/RHI/unit/test_device.cpp
@@ -2,11 +2,11 @@
 
 using namespace XCEngine::RHI;
 
-TEST_F(RHITestFixture, Device_Create_Success) {
+TEST_P(RHITestFixture, Device_Create_Success) {
     ASSERT_NE(GetDevice(), nullptr);
 }
 
-TEST_F(RHITestFixture, Device_Initialize_Shutdown) {
+TEST_P(RHITestFixture, Device_Initialize_Shutdown) {
     RHIDevice* device = RHIFactory::CreateRHIDevice(GetBackendType());
     ASSERT_NE(device, nullptr);
 
@@ -19,7 +19,7 @@ TEST_F(RHITestFixture, Device_Initialize_Shutdown) {
     delete device;
 }
 
-TEST_F(RHITestFixture, Device_GetCapabilities_ReturnsValid) {
+TEST_P(RHITestFixture, Device_GetCapabilities_ReturnsValid) {
     const auto& caps = GetDevice()->GetCapabilities();
 
     EXPECT_GE(caps.maxTexture2DSize, 0u);
@@ -28,14 +28,14 @@ TEST_F(RHITestFixture, Device_GetCapabilities_ReturnsValid) {
     EXPECT_GE(caps.maxVertexAttribs, 8u);
 }
 
-TEST_F(RHITestFixture, Device_GetDeviceInfo_ReturnsValid) {
+TEST_P(RHITestFixture, Device_GetDeviceInfo_ReturnsValid) {
     const auto& info = GetDevice()->GetDeviceInfo();
 
     EXPECT_FALSE(info.vendor.empty());
     EXPECT_FALSE(info.renderer.empty());
 }
 
-TEST_F(RHITestFixture, Device_CreateBuffer_ReturnsValid) {
+TEST_P(RHITestFixture, Device_CreateBuffer_ReturnsValid) {
     BufferDesc desc = {};
     desc.size = 1024;
     desc.stride = sizeof(float);
@@ -49,7 +49,7 @@ TEST_F(RHITestFixture, Device_CreateBuffer_ReturnsValid) {
     delete buffer;
 }
 
-TEST_F(RHITestFixture, Device_CreateTexture_ReturnsValid) {
+TEST_P(RHITestFixture, Device_CreateTexture_ReturnsValid) {
     TextureDesc desc = {};
     desc.width = 512;
     desc.height = 512;
@@ -66,7 +66,7 @@ TEST_F(RHITestFixture, Device_CreateTexture_ReturnsValid) {
     delete texture;
 }
 
-TEST_F(RHITestFixture, Device_CreateFence_ReturnsValid) {
+TEST_P(RHITestFixture, Device_CreateFence_ReturnsValid) {
     FenceDesc desc = {};
     desc.initialValue = 0;
     desc.flags = 0;
@@ -79,7 +79,7 @@ TEST_F(RHITestFixture, Device_CreateFence_ReturnsValid) {
     delete fence;
 }
 
-TEST_F(RHITestFixture, Device_CreateCommandQueue_ReturnsValid) {
+TEST_P(RHITestFixture, Device_CreateCommandQueue_ReturnsValid) {
     CommandQueueDesc desc = {};
     desc.queueType = static_cast<uint32_t>(CommandQueueType::Direct);
 
@@ -91,7 +91,7 @@ TEST_F(RHITestFixture, Device_CreateCommandQueue_ReturnsValid) {
     delete queue;
 }
 
-TEST_F(RHITestFixture, Device_CreateCommandList_ReturnsValid) {
+TEST_P(RHITestFixture, Device_CreateCommandList_ReturnsValid) {
     CommandListDesc desc = {};
     desc.commandListType = static_cast<uint32_t>(CommandQueueType::Direct);
 
@@ -102,7 +102,7 @@ TEST_F(RHITestFixture, Device_CreateCommandList_ReturnsValid) {
     delete cmdList;
 }
 
-TEST_F(RHITestFixture, Device_CreateSampler_ReturnsValid) {
+TEST_P(RHITestFixture, Device_CreateSampler_ReturnsValid) {
     SamplerDesc desc = {};
     desc.filter = static_cast<uint32_t>(FilterMode::Linear);
     desc.addressU = static_cast<uint32_t>(TextureAddressMode::Wrap);
@@ -116,7 +116,7 @@ TEST_F(RHITestFixture, Device_CreateSampler_ReturnsValid) {
     delete sampler;
 }
 
-TEST_F(RHITestFixture, Device_GetNativeDevice_ReturnsValid) {
+TEST_P(RHITestFixture, Device_GetNativeDevice_ReturnsValid) {
     void* native = GetDevice()->GetNativeDevice();
     ASSERT_NE(native, nullptr);
 }
diff --git a/tests/RHI/unit/test_fence.cpp b/tests/RHI/unit/test_fence.cpp
index 54d02f3a..feaa1442 100644
--- a/tests/RHI/unit/test_fence.cpp
+++ b/tests/RHI/unit/test_fence.cpp
@@ -3,7 +3,7 @@
 
 using namespace XCEngine::RHI;
 
-TEST_F(RHITestFixture, Fence_Create) {
+TEST_P(RHITestFixture, Fence_Create) {
     FenceDesc desc = {};
     desc.initialValue = 0;
     desc.flags = 0;
@@ -15,7 +15,7 @@ TEST_F(RHITestFixture, Fence_Create) {
     delete fence;
 }
 
-TEST_F(RHITestFixture, Fence_Signal) {
+TEST_P(RHITestFixture, Fence_Signal) {
     FenceDesc desc = {};
     desc.initialValue = 0;
 
@@ -28,7 +28,7 @@ TEST_F(RHITestFixture, Fence_Signal) {
     delete fence;
 }
 
-TEST_F(RHITestFixture, Fence_SignalWithValue) {
+TEST_P(RHITestFixture, Fence_SignalWithValue) {
     FenceDesc desc = {};
     desc.initialValue = 0;
 
@@ -41,7 +41,7 @@ TEST_F(RHITestFixture, Fence_SignalWithValue) {
     delete fence;
 }
 
-TEST_F(RHITestFixture, Fence_Wait) {
+TEST_P(RHITestFixture, Fence_Wait) {
     FenceDesc desc = {};
     desc.initialValue = 0;
 
@@ -55,7 +55,7 @@ TEST_F(RHITestFixture, Fence_Wait) {
     delete fence;
 }
 
-TEST_F(RHITestFixture, Fence_GetCompletedValue) {
+TEST_P(RHITestFixture, Fence_GetCompletedValue) {
     FenceDesc desc = {};
     desc.initialValue = 0;
 
@@ -70,7 +70,7 @@ TEST_F(RHITestFixture, Fence_GetCompletedValue) {
     delete fence;
 }
 
-TEST_F(RHITestFixture, Fence_IsSignaled) {
+TEST_P(RHITestFixture, Fence_IsSignaled) {
     FenceDesc desc = {};
     desc.initialValue = 0;
 
@@ -85,7 +85,7 @@ TEST_F(RHITestFixture, Fence_IsSignaled) {
     delete fence;
 }
 
-TEST_F(RHITestFixture, Fence_GetNativeHandle) {
+TEST_P(RHITestFixture, Fence_GetNativeHandle) {
     FenceDesc desc = {};
     desc.initialValue = 0;
 
diff --git a/tests/RHI/unit/test_sampler.cpp b/tests/RHI/unit/test_sampler.cpp
index fac5fd1a..75ebdf01 100644
--- a/tests/RHI/unit/test_sampler.cpp
+++ b/tests/RHI/unit/test_sampler.cpp
@@ -3,7 +3,7 @@
 
 using namespace XCEngine::RHI;
 
-TEST_F(RHITestFixture, Sampler_Create) {
+TEST_P(RHITestFixture, Sampler_Create) {
     SamplerDesc desc = {};
     desc.filter = static_cast<uint32_t>(FilterMode::Linear);
     desc.addressU = static_cast<uint32_t>(TextureAddressMode::Wrap);
@@ -26,7 +26,7 @@ TEST_F(RHITestFixture, Sampler_Create) {
     delete sampler;
 }
 
-TEST_F(RHITestFixture, Sampler_Bind_Unbind) {
+TEST_P(RHITestFixture, Sampler_Bind_Unbind) {
     SamplerDesc desc = {};
     desc.filter = static_cast<uint32_t>(FilterMode::Linear);
     desc.addressU = static_cast<uint32_t>(TextureAddressMode::Wrap);
@@ -43,7 +43,7 @@ TEST_F(RHITestFixture, Sampler_Bind_Unbind) {
     delete sampler;
 }
 
-TEST_F(RHITestFixture, Sampler_GetID) {
+TEST_P(RHITestFixture, Sampler_GetID) {
     SamplerDesc desc = {};
     desc.filter = static_cast<uint32_t>(FilterMode::Linear);
     desc.addressU = static_cast<uint32_t>(TextureAddressMode::Wrap);
@@ -60,7 +60,7 @@ TEST_F(RHITestFixture, Sampler_GetID) {
     delete sampler;
 }
 
-TEST_F(RHITestFixture, Sampler_GetNativeHandle) {
+TEST_P(RHITestFixture, Sampler_GetNativeHandle) {
     SamplerDesc desc = {};
     desc.filter = static_cast<uint32_t>(FilterMode::Linear);
     desc.addressU = static_cast<uint32_t>(TextureAddressMode::Wrap);
diff --git a/tests/RHI/unit/test_shader.cpp b/tests/RHI/unit/test_shader.cpp
index 07e5f06a..5cf13814 100644
--- a/tests/RHI/unit/test_shader.cpp
+++ b/tests/RHI/unit/test_shader.cpp
@@ -3,52 +3,52 @@
 
 using namespace XCEngine::RHI;
 
-TEST_F(RHITestFixture, Shader_Compile_EmptyDesc_ReturnsNullptr) {
+TEST_P(RHITestFixture, Shader_Compile_EmptyDesc_ReturnsNullptr) {
     RHIShader* shader = GetDevice()->CompileShader({});
     EXPECT_EQ(shader, nullptr);
 }
 
-TEST_F(RHITestFixture, Shader_GetType_WithNullShader) {
+TEST_P(RHITestFixture, Shader_GetType_WithNullShader) {
     RHIShader* shader = GetDevice()->CompileShader({});
     EXPECT_EQ(shader, nullptr);
 }
 
-TEST_F(RHITestFixture, Shader_IsValid_WithNullShader) {
+TEST_P(RHITestFixture, Shader_IsValid_WithNullShader) {
     RHIShader* shader = GetDevice()->CompileShader({});
     EXPECT_EQ(shader, nullptr);
 }
 
-TEST_F(RHITestFixture, Shader_Bind_WithNullShader) {
+TEST_P(RHITestFixture, Shader_Bind_WithNullShader) {
     RHIShader* shader = GetDevice()->CompileShader({});
     EXPECT_EQ(shader, nullptr);
 }
 
-TEST_F(RHITestFixture, Shader_SetInt_WithNullShader) {
+TEST_P(RHITestFixture, Shader_SetInt_WithNullShader) {
     RHIShader* shader = GetDevice()->CompileShader({});
     EXPECT_EQ(shader, nullptr);
 }
 
-TEST_F(RHITestFixture, Shader_SetFloat_WithNullShader) {
+TEST_P(RHITestFixture, Shader_SetFloat_WithNullShader) {
     RHIShader* shader = GetDevice()->CompileShader({});
     EXPECT_EQ(shader, nullptr);
 }
 
-TEST_F(RHITestFixture, Shader_SetVec3_WithNullShader) {
+TEST_P(RHITestFixture, Shader_SetVec3_WithNullShader) {
     RHIShader* shader = GetDevice()->CompileShader({});
     EXPECT_EQ(shader, nullptr);
 }
 
-TEST_F(RHITestFixture, Shader_SetVec4_WithNullShader) {
+TEST_P(RHITestFixture, Shader_SetVec4_WithNullShader) {
     RHIShader* shader = GetDevice()->CompileShader({});
     EXPECT_EQ(shader, nullptr);
 }
 
-TEST_F(RHITestFixture, Shader_SetMat4_WithNullShader) {
+TEST_P(RHITestFixture, Shader_SetMat4_WithNullShader) {
     RHIShader* shader = GetDevice()->CompileShader({});
     EXPECT_EQ(shader, nullptr);
 }
 
-TEST_F(RHITestFixture, Shader_GetNativeHandle_WithNullShader) {
+TEST_P(RHITestFixture, Shader_GetNativeHandle_WithNullShader) {
     RHIShader* shader = GetDevice()->CompileShader({});
     EXPECT_EQ(shader, nullptr);
 }
diff --git a/tests/RHI/unit/test_swap_chain.cpp b/tests/RHI/unit/test_swap_chain.cpp
index 06d70c6d..9b526d9b 100644
--- a/tests/RHI/unit/test_swap_chain.cpp
+++ b/tests/RHI/unit/test_swap_chain.cpp
@@ -3,7 +3,7 @@
 
 using namespace XCEngine::RHI;
 
-TEST_F(RHITestFixture, SwapChain_Create) {
+TEST_P(RHITestFixture, SwapChain_Create) {
     SwapChainDesc desc = {};
     desc.width = 800;
     desc.height = 600;
@@ -22,7 +22,7 @@ TEST_F(RHITestFixture, SwapChain_Create) {
     delete swapChain;
 }
 
-TEST_F(RHITestFixture, SwapChain_GetCurrentBackBufferIndex) {
+TEST_P(RHITestFixture, SwapChain_GetCurrentBackBufferIndex) {
     SwapChainDesc desc = {};
     desc.width = 800;
     desc.height = 600;
@@ -39,7 +39,7 @@ TEST_F(RHITestFixture, SwapChain_GetCurrentBackBufferIndex) {
     delete swapChain;
 }
 
-TEST_F(RHITestFixture, SwapChain_GetCurrentBackBuffer) {
+TEST_P(RHITestFixture, SwapChain_GetCurrentBackBuffer) {
     SwapChainDesc desc = {};
     desc.width = 800;
     desc.height = 600;
@@ -56,7 +56,7 @@ TEST_F(RHITestFixture, SwapChain_GetCurrentBackBuffer) {
     delete swapChain;
 }
 
-TEST_F(RHITestFixture, SwapChain_Resize) {
+TEST_P(RHITestFixture, SwapChain_Resize) {
     SwapChainDesc desc = {};
     desc.width = 800;
     desc.height = 600;
@@ -72,7 +72,7 @@ TEST_F(RHITestFixture, SwapChain_Resize) {
     delete swapChain;
 }
 
-TEST_F(RHITestFixture, SwapChain_FullscreenState) {
+TEST_P(RHITestFixture, SwapChain_FullscreenState) {
     SwapChainDesc desc = {};
     desc.width = 800;
     desc.height = 600;
@@ -91,7 +91,7 @@ TEST_F(RHITestFixture, SwapChain_FullscreenState) {
     delete swapChain;
 }
 
-TEST_F(RHITestFixture, SwapChain_ShouldClose) {
+TEST_P(RHITestFixture, SwapChain_ShouldClose) {
     SwapChainDesc desc = {};
     desc.width = 800;
     desc.height = 600;
diff --git a/tests/RHI/unit/test_texture.cpp b/tests/RHI/unit/test_texture.cpp
index 03ef1966..f91c43dc 100644
--- a/tests/RHI/unit/test_texture.cpp
+++ b/tests/RHI/unit/test_texture.cpp
@@ -3,7 +3,7 @@
 
 using namespace XCEngine::RHI;
 
-TEST_F(RHITestFixture, Texture_Create_Texture2D) {
+TEST_P(RHITestFixture, Texture_Create_Texture2D) {
     TextureDesc desc = {};
     desc.width = 512;
     desc.height = 512;
@@ -30,7 +30,7 @@ TEST_F(RHITestFixture, Texture_Create_Texture2D) {
     delete texture;
 }
 
-TEST_F(RHITestFixture, Texture_Create_Texture3D) {
+TEST_P(RHITestFixture, Texture_Create_Texture3D) {
     TextureDesc desc = {};
     desc.width = 64;
     desc.height = 64;
@@ -51,7 +51,7 @@ TEST_F(RHITestFixture, Texture_Create_Texture3D) {
     delete texture;
 }
 
-TEST_F(RHITestFixture, Texture_StateManagement) {
+TEST_P(RHITestFixture, Texture_StateManagement) {
     TextureDesc desc = {};
     desc.width = 256;
     desc.height = 256;
@@ -69,7 +69,7 @@ TEST_F(RHITestFixture, Texture_StateManagement) {
     delete texture;
 }
 
-TEST_F(RHITestFixture, Texture_Naming) {
+TEST_P(RHITestFixture, Texture_Naming) {
     TextureDesc desc = {};
     desc.width = 256;
     desc.height = 256;
@@ -86,7 +86,7 @@ TEST_F(RHITestFixture, Texture_Naming) {
     delete texture;
 }
 
-TEST_F(RHITestFixture, Texture_GetNativeHandle) {
+TEST_P(RHITestFixture, Texture_GetNativeHandle) {
     TextureDesc desc = {};
     desc.width = 256;
     desc.height = 256;