diff --git a/rosbag2_cpp/CMakeLists.txt b/rosbag2_cpp/CMakeLists.txt
index 86632088a8..0b4b527ff8 100644
--- a/rosbag2_cpp/CMakeLists.txt
+++ b/rosbag2_cpp/CMakeLists.txt
@@ -120,6 +120,7 @@ if(BUILD_TESTING)
   find_package(ament_cmake_gmock REQUIRED)
   find_package(ament_lint_auto REQUIRED)
   find_package(test_msgs REQUIRED)
+  find_package(rosbag2_test_common REQUIRED)
   ament_lint_auto_find_test_dependencies()
 
   add_library(
diff --git a/rosbag2_cpp/package.xml b/rosbag2_cpp/package.xml
index 99b5cd3e7c..cd3fde474c 100644
--- a/rosbag2_cpp/package.xml
+++ b/rosbag2_cpp/package.xml
@@ -24,7 +24,7 @@
   <depend>rosidl_typesupport_introspection_cpp</depend>
   <depend>shared_queues_vendor_future</depend>
 
-  <exec_depend>rosbag2_storage_defaul_future</exec_depend>
+  <exec_depend>rosbag2_storage_default_plugins_future</exec_depend>
 
   <test_depend>ament_cmake_gmock</test_depend>
   <test_depend>ament_lint_auto</test_depend>
diff --git a/rosbag2_tests/CMakeLists.txt b/rosbag2_tests/CMakeLists.txt
index 2b7afdf6d4..a03c8c81f3 100644
--- a/rosbag2_tests/CMakeLists.txt
+++ b/rosbag2_tests/CMakeLists.txt
@@ -37,6 +37,7 @@ if(BUILD_TESTING)
   find_package(rclcpp REQUIRED)
   find_package(rcpputils REQUIRED)
   find_package(rosbag2_compression REQUIRED)
+  find_package(rosbag2_compression_zstd REQUIRED)
   find_package(rosbag2_cpp REQUIRED)
   find_package(rosbag2_storage REQUIRED)
   find_package(rosbag2_storage_default_plugins REQUIRED)