diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 92eefbafe..b4a169175 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,6 +10,7 @@ jobs:
     name: Test
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         build: [x86_64, i686, x86_64-musl, mingw, system-curl, openssl-110, x86_64-beta, x86_64-nightly, macos, win64, win32]
         include:
diff --git a/curl-sys/Cargo.toml b/curl-sys/Cargo.toml
index 9e0a023ea..7a4b6d96c 100644
--- a/curl-sys/Cargo.toml
+++ b/curl-sys/Cargo.toml
@@ -35,12 +35,10 @@ openssl-sys = { version = "0.9.64", optional = true }
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3", features = ["winsock2", "ws2def"] }
 
-[target.'cfg(target_env = "msvc")'.build-dependencies]
-vcpkg = "0.2"
-
 [build-dependencies]
 pkg-config = "0.3.3"
 cc = "1.0"
+vcpkg = "0.2"
 
 [features]
 default = ["ssl"]
diff --git a/curl-sys/build.rs b/curl-sys/build.rs
index 285ab57e8..674fff5f0 100644
--- a/curl-sys/build.rs
+++ b/curl-sys/build.rs
@@ -446,13 +446,13 @@ fn main() {
     }
 }
 
-#[cfg(not(target_env = "msvc"))]
 fn try_vcpkg() -> bool {
-    false
-}
+    if vcpkg::find_package("curl").is_ok() {
+        // find_package pulls in all depenedencies as needed, so there's no need
+        // for the other logic here.
+        return true;
+    }
 
-#[cfg(target_env = "msvc")]
-fn try_vcpkg() -> bool {
     // the import library for the dll is called libcurl_imp
     let mut successful_probe_details = match vcpkg::Config::new()
         .lib_names("libcurl_imp", "libcurl")