diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index b7cdf6492..079706621 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -870,11 +870,20 @@ axes:
         run_on: rhel70-small
         batchtime: 10080  # 7 days
 
+  # OSes that support versions of MongoDB>=2.6 and <4.0 with SSL.
+  - id: os-no-40-plus
+    display_name: OS
+    values:
       - id: debian71-test
         display_name: "Debian 7.1"
         run_on: debian71-test
         batchtime: 10080  # 7 days
 
+      - id: ubuntu-12.04
+        display_name: "Ubuntu 12.04"
+        run_on: ubuntu1204-test
+        batchtime: 10080  # 7 days
+
   # OSes that support versions of MongoDB without SSL.
   - id: os-nossl
     display_name: OS
@@ -1164,6 +1173,16 @@ buildvariants:
      - ".3.0"
      - ".2.6"
 
+- matrix_name: "tests-no-40-plus"
+  matrix_spec: {"os-no-40-plus": "*", auth-ssl: "*"}
+  display_name: "${os-no-40-plus} ${auth-ssl}"
+  tasks:
+     - ".3.6"
+     - ".3.4"
+     - ".3.2"
+     - ".3.0"
+     - ".2.6"
+
 - matrix_name: "tests-nossl"
   matrix_spec: {"os-nossl": "*", auth: "*", ssl: "nossl"}
   display_name: "${os-nossl} ${auth} ${ssl}"
diff --git a/test/utils.py b/test/utils.py
index 10b95e00c..c11041667 100644
--- a/test/utils.py
+++ b/test/utils.py
@@ -480,7 +480,7 @@ def run_threads(collection, target):
         t.start()
 
     for t in threads:
-        t.join(30)
+        t.join(60)
         assert not t.isAlive()