diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.24.4-r1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.24.4-r1.ebuild
index 5333c66..6cdbf67 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.24.4-r1.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.24.4-r1.ebuild
@@ -62,9 +62,8 @@ src_prepare() {
 	sed -i '/^\s*install\s*(FILES COPYING NEWS/,/^\s*)/{d}' CMakeLists.txt || die
 
 	# enable tests
-	sed -i '/message ("--   disabling test-libmongoc since using system libbson")/{d}' CMakeLists.txt || die
+	sed -i '/message (STATUS "disabling test-libmongoc since using system libbson")/{d}' CMakeLists.txt || die
 	sed -i '/SET (ENABLE_TESTS OFF)/{d}' CMakeLists.txt || die
-	sed -i 's/message (FATAL_ERROR "System libbson built without static library target")/message (STATUS "System libbson built without static library target")/' CMakeLists.txt || die
 	sed -i 's#<bson/bson-private.h>#"bson/bson-private.h"#' src/libbson/tests/test-bson.c || die
 }
 
@@ -76,7 +75,7 @@ src_configure() {
 		-DENABLE_ICU="$(usex icu ON OFF)"
 		-DENABLE_MAN_PAGES=ON
 		-DENABLE_MONGOC=ON
-		-DENABLE_SNAPPY=AUTO
+		-DENABLE_SNAPPY=ON
 		-DENABLE_ZLIB=SYSTEM
 		-DENABLE_SASL="$(usex sasl CYRUS OFF)"
 		-DENABLE_SSL="$(usex ssl $(usex ssl OPENSSL) OFF)"
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.27.4.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.27.4.ebuild
index f56c949..cff2eb1 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.27.4.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.27.4.ebuild
@@ -69,7 +69,6 @@ src_prepare() {
 	# enable tests
 	sed -i '/message (STATUS "disabling test-libmongoc since using system libbson")/{d}' CMakeLists.txt || die
 	sed -i '/SET (ENABLE_TESTS OFF)/{d}' CMakeLists.txt || die
-	sed -i 's/message (FATAL_ERROR "System libbson built without static library target")/message (STATUS "System libbson built without static library target")/' CMakeLists.txt || die
 	sed -i 's#<bson/bson-private.h>#"bson/bson-private.h"#' src/libbson/tests/test-bson.c || die
 }
 
@@ -82,7 +81,7 @@ src_configure() {
 		-DENABLE_MAN_PAGES=ON
 		-DENABLE_MONGOC=ON
 		-DENABLE_MONGODB_AWS_AUTH="$(usex s3 ON OFF)"
-		-DENABLE_SNAPPY=AUTO
+		-DENABLE_SNAPPY=ON
 		-DENABLE_ZLIB=SYSTEM
 		-DENABLE_SASL="$(usex sasl CYRUS OFF)"
 		-DENABLE_SRV=ON