diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt
index f0a1908042..97ba2c4915 100644
--- a/unit_tests/CMakeLists.txt
+++ b/unit_tests/CMakeLists.txt
@@ -234,7 +234,7 @@ if(MSVC)
   target_link_libraries (igdrcl_tests gtest gmock Ws2_32.lib)
 else()
   add_executable(igdrcl_linux
-    "main_linux.cpp"
+    ${IGDRCL_SRCS_linux_tests}
     $<TARGET_OBJECTS:igdrcl_libult_cs>
     ${IGDRCL_SOURCE_DIR}/unit_tests/abort.cpp
     ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/debug_helpers.cpp
diff --git a/unit_tests/linux/CMakeLists.txt b/unit_tests/linux/CMakeLists.txt
index 6f87cf0f4e..5d8e5eab4e 100644
--- a/unit_tests/linux/CMakeLists.txt
+++ b/unit_tests/linux/CMakeLists.txt
@@ -23,12 +23,16 @@ cmake_minimum_required(VERSION 3.2.0 FATAL_ERROR)
 project(igdrcl_linux_dll_tests)
 
 if(UNIX)
-    set(IGDRCL_SRCS_linux_dll_tests 
-        "${IGDRCL_SRCS_linux_dll_tests}"
-        "${CMAKE_CURRENT_SOURCE_DIR}/main_linux_dll.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/drm_null_device_tests.cpp"
-				"${CMAKE_CURRENT_SOURCE_DIR}/mock_os_layer.cpp"
-				"${CMAKE_CURRENT_SOURCE_DIR}/mock_os_layer.h"
-        "${IGDRCL_SOURCE_DIR}/runtime/os_interface/debug_settings_manager.cpp"
-    PARENT_SCOPE)
+	set(IGDRCL_SRCS_linux_dll_tests 
+		"${IGDRCL_SRCS_linux_dll_tests}"
+		"${CMAKE_CURRENT_SOURCE_DIR}/main_linux_dll.cpp"
+		"${CMAKE_CURRENT_SOURCE_DIR}/drm_null_device_tests.cpp"
+		"${CMAKE_CURRENT_SOURCE_DIR}/mock_os_layer.cpp"
+		"${CMAKE_CURRENT_SOURCE_DIR}/mock_os_layer.h"
+		"${IGDRCL_SOURCE_DIR}/runtime/os_interface/debug_settings_manager.cpp"
+	PARENT_SCOPE)
+
+	set(IGDRCL_SRCS_linux_tests
+		"${CMAKE_CURRENT_SOURCE_DIR}/main_linux.cpp"
+	PARENT_SCOPE)
 endif()
diff --git a/unit_tests/main_linux.cpp b/unit_tests/linux/main_linux.cpp
similarity index 94%
rename from unit_tests/main_linux.cpp
rename to unit_tests/linux/main_linux.cpp
index c948edaae9..dcbaec72bc 100644
--- a/unit_tests/main_linux.cpp
+++ b/unit_tests/linux/main_linux.cpp
@@ -28,13 +28,15 @@
 using namespace OCLRT;
 
 int main(int argc, char **argv) {
-    bool useDefaultListener = true;
+    bool useDefaultListener = false;
 
     ::testing::InitGoogleTest(&argc, argv);
 
     for (int i = 1; i < argc; ++i) {
         if (!strcmp("--disable_default_listener", argv[i])) {
             useDefaultListener = false;
+        } else if (!strcmp("--enable_default_listener", argv[i])) {
+            useDefaultListener = true;
         }
     }
 
diff --git a/unit_tests/linux/main_linux_dll.cpp b/unit_tests/linux/main_linux_dll.cpp
index d1c6e753b3..143fca1564 100644
--- a/unit_tests/linux/main_linux_dll.cpp
+++ b/unit_tests/linux/main_linux_dll.cpp
@@ -281,7 +281,7 @@ TEST_F(DrmTests, failOnInvalidDeviceName) {
 }
 
 int main(int argc, char **argv) {
-    bool useDefaultListener = true;
+    bool useDefaultListener = false;
 
     ::testing::InitGoogleTest(&argc, argv);
 
@@ -289,6 +289,8 @@ int main(int argc, char **argv) {
     for (int i = 1; i < argc; ++i) {
         if (!strcmp("--disable_default_listener", argv[i])) {
             useDefaultListener = false;
+        } else if (!strcmp("--enable_default_listener", argv[i])) {
+            useDefaultListener = true;
         }
     }