diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2980aae2a9..f961a8e7a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -375,7 +375,7 @@ foreach(CONFIG_SRC ${CONFIG_SOURCES})
 endforeach()
 
 if (BUILD_TESTS)
-  add_subdirectory(unittests/)
+#  add_subdirectory(unittests/)
 endif()
 
 if (BUILD_THUNKS)
diff --git a/ThunkLibs/GuestLibs/CMakeLists.txt b/ThunkLibs/GuestLibs/CMakeLists.txt
index b1bf3f53d0..f416d8d0f0 100644
--- a/ThunkLibs/GuestLibs/CMakeLists.txt
+++ b/ThunkLibs/GuestLibs/CMakeLists.txt
@@ -183,10 +183,8 @@ if (BITNESS EQUAL 64)
 
   # libGL must pull in libX11.so, so generate a placeholder libX11.so to link against
 if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
-  add_library(PlaceholderX11 SHARED ../libX11/libX11_NativeGuest.cpp)
-  target_link_options(PlaceholderX11 PRIVATE "LINKER:-soname,libX11.so.6")
-  set_target_properties(PlaceholderX11 PROPERTIES NO_SONAME ON)
-  target_link_libraries(GL-guest PRIVATE PlaceholderX11)
+  add_library(X11 SHARED ../libX11/libX11_NativeGuest.cpp)
+  target_link_libraries(GL-guest PRIVATE X11)
 endif()
 
   # disabled for now, headers are platform specific