diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4e93af2f..ad50e645 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,9 +25,9 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
       - name: Build
-        run: cargo build --verbose
+        run: cargo build --verbose --workspace
       - name: Test
-        run: cargo test --verbose
+        run: cargo test --verbose --workspace
       - name: Lint
-        run: cargo clippy --verbose
+        run: cargo clippy --verbose --workspace
 
diff --git a/libs/hc_git/src/lib.rs b/libs/hc_git/src/lib.rs
index bc1752a5..06edfa41 100644
--- a/libs/hc_git/src/lib.rs
+++ b/libs/hc_git/src/lib.rs
@@ -106,7 +106,7 @@ pub fn get_commits_for_file(repo_path: &Path, file: &str) -> Result<String> {
 #[cfg(test)]
 mod test {
 	use super::*;
-	use hc_command_util::DependentProgram;
+	use hc_common::command_util::DependentProgram;
 
 	#[test]
 	#[ignore = "can't guarantee availability of Git"]
diff --git a/libs/hc_npm/src/lib.rs b/libs/hc_npm/src/lib.rs
index 3c065e59..b2f93b7a 100644
--- a/libs/hc_npm/src/lib.rs
+++ b/libs/hc_npm/src/lib.rs
@@ -255,8 +255,7 @@ impl NpmCommand {
 #[cfg(test)]
 mod test {
 	use super::*;
-
-	use hc_command_util::DependentProgram;
+	use hc_common::command_util::DependentProgram;
 
 	#[test]
 	#[ignore = "can't guarantee availability of NPM"]
diff --git a/libs/hc_session/src/lib.rs b/libs/hc_session/src/lib.rs
index 337d8667..a484048b 100644
--- a/libs/hc_session/src/lib.rs
+++ b/libs/hc_session/src/lib.rs
@@ -494,7 +494,7 @@ pub enum CheckType {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use hc_common::with_env_vars;
+	use hc_common::test_util::with_env_vars;
 	use tempfile::TempDir;
 
 	const TEMPDIR_PREFIX: &str = "hc_test";
diff --git a/tests/can_run.rs b/tests/can_run.rs
index e0a76af1..1892f28d 100644
--- a/tests/can_run.rs
+++ b/tests/can_run.rs
@@ -1,4 +1,4 @@
-use hc_common::{CheckKind, Result};
+use hc_common::{error::Result, CheckKind};
 use hc_core::*;
 use std::ffi::OsString;
 use tempfile::tempdir;