diff --git a/dfx.nix b/dfx.nix
index e4fc63ad80..ccdfb20449 100644
--- a/dfx.nix
+++ b/dfx.nix
@@ -24,11 +24,11 @@ let
       ".*Cargo\.lock$"
       "^.cargo/config$"
     ];
+    cargoTestCommands = _: [
+      ''cargo $cargo_options test $cargo_test_options --workspace --exclude ic-http-agent''
+      ''RUST_TEST_THREADS=1 cargo $cargo_options test $cargo_test_options -p ic-http-agent''
+    ];
     static = pkgs.stdenv.isLinux;
-
-    override = _: {
-      RUST_TEST_THREADS = 1;
-    };
   };
 
   # add extra executables used when linting
diff --git a/nix/sources.json b/nix/sources.json
index a1e23b550f..1f5891b567 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -28,7 +28,7 @@
     "common": {
         "ref": "master",
         "repo": "ssh://git@github.com/dfinity-lab/common",
-        "rev": "18b21123f4bf7208be86e2f8865cc6f2328f09c2",
+        "rev": "c022ff9f16ed0b9e3eb4ed97f26b493de3858df7",
         "type": "git"
     },
     "dfinity": {