2 files changed, 12 insertions, 7 deletions
diff --git a/tests/gtests/alembic/CMakeLists.txt b/tests/gtests/alembic/CMakeLists.txt
index bf1577ff33a..d401f57eff8 100644
--- a/tests/gtests/alembic/CMakeLists.txt
+++ b/tests/gtests/alembic/CMakeLists.txt
@@ -32,6 +32,11 @@ set(INC
 	${OPENEXR_INCLUDE_DIRS}
 )
 
+set(LIB
+	bf_blenloader  # Should not be needed but gives linking error without it.
+	bf_alembic
+)
+
 include_directories(${INC})
 
 setup_libdirs()
@@ -44,7 +49,7 @@ else()
 endif()
 
 # For motivation on doubling BLENDER_SORTED_LIBS, see ../bmesh/CMakeLists.txt
-BLENDER_SRC_GTEST(alembic "abc_matrix_test.cc;abc_export_test.cc;${_buildinfo_src}" "${BLENDER_SORTED_LIBS};${BLENDER_SORTED_LIBS}")
+BLENDER_SRC_GTEST(alembic "abc_matrix_test.cc;abc_export_test.cc;${_buildinfo_src}" "${LIB}")
 
 unset(_buildinfo_src)
 
diff --git a/tests/gtests/bmesh/CMakeLists.txt b/tests/gtests/bmesh/CMakeLists.txt
index 6bd2be1ad83..10484751ca3 100644
--- a/tests/gtests/bmesh/CMakeLists.txt
+++ b/tests/gtests/bmesh/CMakeLists.txt
@@ -27,21 +27,21 @@ set(INC
 	../../../intern/guardedalloc
 )
 
+set(LIB
+	bf_blenloader  # Should not be needed but gives linking error without it.
+	bf_bmesh
+)
+
 include_directories(${INC})
 
 setup_libdirs()
-get_property(BLENDER_SORTED_LIBS GLOBAL PROPERTY BLENDER_SORTED_LIBS_PROP)
-
-# Current BLENDER_SORTED_LIBS works with starting list of symbols in creator, but not
-# for this test. Doubling the list does let all the symbols be resolved, but link time is a bit painful.
-set(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} ${BLENDER_SORTED_LIBS})
 
 if(WITH_BUILDINFO)
 	set(_buildinfo_src "$<TARGET_OBJECTS:buildinfoobj>")
 else()
 	set(_buildinfo_src "")
 endif()
-BLENDER_SRC_GTEST(bmesh_core "bmesh_core_test.cc;${_buildinfo_src}" "${BLENDER_SORTED_LIBS}")
+BLENDER_SRC_GTEST(bmesh_core "bmesh_core_test.cc;${_buildinfo_src}" "${LIB}")
 unset(_buildinfo_src)
 
 setup_liblinks(bmesh_core_test)