diff --git a/opencl/test/unit_test/linux/mock_os_layer.cpp b/opencl/test/unit_test/linux/mock_os_layer.cpp
index 7e11f0a393..01feb3eedb 100644
--- a/opencl/test/unit_test/linux/mock_os_layer.cpp
+++ b/opencl/test/unit_test/linux/mock_os_layer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2020 Intel Corporation
+ * Copyright (C) 2017-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -176,7 +176,7 @@ int drmGetContextParam(drm_i915_gem_context_param *param) {
     return ret;
 }
 
-int drmContextCreate(drm_i915_gem_context_create *create) {
+int drmContextCreate(drm_i915_gem_context_create_ext *create) {
     assert(create);
 
     create->ctx_id = 1;
@@ -253,8 +253,8 @@ int ioctl(int fd, unsigned long int request, ...) throw() {
             case DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM:
                 res = drmGetContextParam(va_arg(vl, drm_i915_gem_context_param *));
                 break;
-            case DRM_IOCTL_I915_GEM_CONTEXT_CREATE:
-                res = drmContextCreate(va_arg(vl, drm_i915_gem_context_create *));
+            case DRM_IOCTL_I915_GEM_CONTEXT_CREATE_EXT:
+                res = drmContextCreate(va_arg(vl, drm_i915_gem_context_create_ext *));
                 break;
             case DRM_IOCTL_I915_GEM_CONTEXT_DESTROY:
                 res = drmContextDestroy(va_arg(vl, drm_i915_gem_context_destroy *));
diff --git a/opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h b/opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h
index 90b95ec754..8e6ece77b3 100644
--- a/opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h
+++ b/opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h
@@ -301,8 +301,8 @@ class DrmMockCustom : public Drm {
             getContextParam->value = getContextParamRetValue;
         } break;
 
-        case DRM_IOCTL_I915_GEM_CONTEXT_CREATE: {
-            auto contextCreateParam = reinterpret_cast<drm_i915_gem_context_create *>(arg);
+        case DRM_IOCTL_I915_GEM_CONTEXT_CREATE_EXT: {
+            auto contextCreateParam = reinterpret_cast<drm_i915_gem_context_create_ext *>(arg);
             contextCreateParam->ctx_id = ++ioctl_cnt.contextCreate;
         } break;
         case DRM_IOCTL_I915_GEM_CONTEXT_DESTROY: {
diff --git a/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp
index 686fc2e8c5..fc0867fcfb 100644
--- a/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp
+++ b/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp
@@ -221,7 +221,7 @@ HWTEST_TEMPLATED_F(DrmCommandStreamTest, givenDrmContextIdWhenFlushingThenSetIdT
 
     EXPECT_CALL(*mock, ioctl(::testing::_, ::testing::_)).WillRepeatedly(::testing::Return(0)).RetiresOnSaturation();
 
-    EXPECT_CALL(*mock, ioctl(DRM_IOCTL_I915_GEM_CONTEXT_CREATE, ::testing::_))
+    EXPECT_CALL(*mock, ioctl(DRM_IOCTL_I915_GEM_CONTEXT_CREATE_EXT, ::testing::_))
         .Times(1)
         .WillRepeatedly(::testing::Invoke(createdContextId))
         .RetiresOnSaturation();
diff --git a/opencl/test/unit_test/os_interface/linux/drm_mock.cpp b/opencl/test/unit_test/os_interface/linux/drm_mock.cpp
index 7d1e120dee..8675523296 100644
--- a/opencl/test/unit_test/os_interface/linux/drm_mock.cpp
+++ b/opencl/test/unit_test/os_interface/linux/drm_mock.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Intel Corporation
+ * Copyright (C) 2019-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -66,8 +66,8 @@ int DrmMock::ioctl(unsigned long request, void *arg) {
         }
     }
 
-    if ((request == DRM_IOCTL_I915_GEM_CONTEXT_CREATE) && (arg != nullptr)) {
-        auto create = static_cast<drm_i915_gem_context_create *>(arg);
+    if ((request == DRM_IOCTL_I915_GEM_CONTEXT_CREATE_EXT) && (arg != nullptr)) {
+        auto create = static_cast<drm_i915_gem_context_create_ext *>(arg);
         this->receivedCreateContextId = create->ctx_id;
         return this->StoredRetVal;
     }
diff --git a/shared/source/os_interface/linux/drm_neo.cpp b/shared/source/os_interface/linux/drm_neo.cpp
index 09ab634e81..77a772fb9e 100644
--- a/shared/source/os_interface/linux/drm_neo.cpp
+++ b/shared/source/os_interface/linux/drm_neo.cpp
@@ -208,8 +208,8 @@ void Drm::setNonPersistentContext(uint32_t drmContextId) {
 }
 
 uint32_t Drm::createDrmContext(uint32_t drmVmId) {
-    drm_i915_gem_context_create gcc = {};
-    auto retVal = ioctl(DRM_IOCTL_I915_GEM_CONTEXT_CREATE, &gcc);
+    drm_i915_gem_context_create_ext gcc = {};
+    auto retVal = ioctl(DRM_IOCTL_I915_GEM_CONTEXT_CREATE_EXT, &gcc);
     UNRECOVERABLE_IF(retVal != 0);
 
     if (drmVmId > 0) {