diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9806dc94f32840b444b7c3abc63f9ea1693de883..dd93c66c32a4073a1428ec3b766b5d4eedff1671 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -22,10 +22,7 @@ jobs:
         default: false
       image:
         type: string
-        default: 1.36.0
-      minimal_build:
-        type: boolean
-        default: false
+        default: 1.40.0
     docker:
       - image: rust:<< parameters.image >>
     environment:
@@ -118,10 +115,6 @@ jobs:
       - restore_cache:
           key: registry
       - run: cargo generate-lockfile
-      - when:
-          condition: << parameters.minimal_build >>
-          steps:
-            - run: cargo update -p pkg-config --precise 0.3.14
       - save_cache:
           key: registry-{{ .BuildNum }}
           paths:
@@ -133,27 +126,24 @@ jobs:
             --manifest-path=openssl/Cargo.toml \
             <<# parameters.vendored >>--features vendored<</ parameters.vendored >> \
             --target << parameters.target >>
-      - unless:
-          condition: << parameters.minimal_build >>
-          steps:
-            - run: |
-                cargo run \
-                  --manifest-path=systest/Cargo.toml \
-                  <<# parameters.vendored >>--features vendored<</ parameters.vendored >> \
-                  --target << parameters.target >>
-            - run: |
-                cargo test \
-                  --manifest-path=openssl-errors/Cargo.toml \
-                  <<# parameters.vendored >>--features openssl-sys/vendored<</ parameters.vendored >> \
-                  --target << parameters.target >> \
-                  <<# parameters.no_run >>--no-run<</ parameters.no_run >>
-            - run: |
-                ulimit -c unlimited
-                cargo test \
-                  --manifest-path=openssl/Cargo.toml \
-                  <<# parameters.vendored >>--features vendored<</ parameters.vendored >> \
-                  --target << parameters.target >> \
-                  <<# parameters.no_run >>--no-run<</ parameters.no_run >>
+      - run: |
+          cargo run \
+            --manifest-path=systest/Cargo.toml \
+            <<# parameters.vendored >>--features vendored<</ parameters.vendored >> \
+            --target << parameters.target >>
+      - run: |
+          cargo test \
+            --manifest-path=openssl-errors/Cargo.toml \
+            <<# parameters.vendored >>--features openssl-sys/vendored<</ parameters.vendored >> \
+            --target << parameters.target >> \
+            <<# parameters.no_run >>--no-run<</ parameters.no_run >>
+      - run: |
+          ulimit -c unlimited
+          cargo test \
+            --manifest-path=openssl/Cargo.toml \
+            <<# parameters.vendored >>--features vendored<</ parameters.vendored >> \
+            --target << parameters.target >> \
+            <<# parameters.no_run >>--no-run<</ parameters.no_run >>
       - save_cache:
           key: deps-<< parameters.image >>-<< parameters.target >>-<< parameters.library >>-<< parameters.version >>-{{ checksum "Cargo.lock" }}
           paths:
@@ -175,7 +165,7 @@ jobs:
         default: false
       image:
         type: string
-        default: 1.36.0
+        default: 1.40.0
     macos:
       xcode: "12.2.0"
     environment:
diff --git a/systest/Cargo.toml b/systest/Cargo.toml
index 9f74f97322ede4458f28efb1e23917d054448138..50f6662a055a614d245dc5ef10733b1c5c213068 100644
--- a/systest/Cargo.toml
+++ b/systest/Cargo.toml
@@ -9,7 +9,7 @@ libc = "0.2"
 openssl-sys = { path = "../openssl-sys" }
 
 [build-dependencies]
-ctest = "0.2"
+ctest2 = "0.4"
 
 [features]
 vendored = ['openssl-sys/vendored']
diff --git a/systest/build.rs b/systest/build.rs
index 3c549265f9dc294913d329f211a1fb44a90f86d4..5cf20bc24e4768eb69e89c606a3b961b571b7f0d 100644
--- a/systest/build.rs
+++ b/systest/build.rs
@@ -5,7 +5,7 @@ use std::env;
 mod cfgs;
 
 fn main() {
-    let mut cfg = ctest::TestGenerator::new();
+    let mut cfg = ctest2::TestGenerator::new();
     let target = env::var("TARGET").unwrap();
 
     if let Ok(out) = env::var("DEP_OPENSSL_INCLUDE") {