diff --git a/opencl/tests/ocltst/module/runtime/OCLDeviceQueries.cpp b/opencl/tests/ocltst/module/runtime/OCLDeviceQueries.cpp
index d270295f16..6e507cbe3e 100644
--- a/opencl/tests/ocltst/module/runtime/OCLDeviceQueries.cpp
+++ b/opencl/tests/ocltst/module/runtime/OCLDeviceQueries.cpp
@@ -119,6 +119,8 @@ static const AMDDeviceInfo DeviceInfo[] = {
     /* Navi32*/    { "gfx1101",     "gfx1101",     4, 32, 1, 256, 64 * Ki, 32, 11, 0 },
     /* Navi33*/    { "gfx1102",     "gfx1102",     4, 32, 1, 256, 64 * Ki, 32, 11, 0 },
     /* Phoenix */  { "gfx1103",     "gfx1103",     4, 32, 1, 256, 64 * Ki, 32, 11, 0 },
+                   { "gfx1200",     "gfx1200",     4, 32, 1, 256, 64 * Ki, 32, 12, 0 },
+                   { "gfx1201",     "gfx1201",     4, 32, 1, 256, 64 * Ki, 32, 12, 0 },
 };
 
 const int DeviceInfoSize = sizeof(DeviceInfo) / sizeof(AMDDeviceInfo);
diff --git a/rocclr/cmake/ROCclrPAL.cmake b/rocclr/cmake/ROCclrPAL.cmake
index bf5d1f5292..d32eda32bb 100644
--- a/rocclr/cmake/ROCclrPAL.cmake
+++ b/rocclr/cmake/ROCclrPAL.cmake
@@ -39,6 +39,7 @@ set(PAL_BUILD_NULL_DEVICE   OFF)
 set(PAL_BUILD_GFX6          ON)
 set(PAL_BUILD_GFX9          ON)
 set(PAL_BUILD_GFX11         ON)
+set(PAL_BUILD_GFX12         ON)
 set(PAL_BUILD_NAVI31        ON)
 set(PAL_BUILD_NAVI32        ON)
 set(PAL_BUILD_NAVI33        ON)