diff --git a/project.clj b/project.clj
index c9429a6..3856503 100644
--- a/project.clj
+++ b/project.clj
@@ -36,11 +36,11 @@
                          [org.openvoxproject/kitchensink "3.5.5"]
                          [org.openvoxproject/kitchensink "3.5.5" :classifier "test"]
                          [org.openvoxproject/ring-middleware "2.1.4"]
-                         [org.openvoxproject/trapperkeeper "4.3.2"]
-                         [org.openvoxproject/trapperkeeper "4.3.2" :classifier "test"]
+                         [org.openvoxproject/trapperkeeper "4.3.3-SNAPSHOT"]
+                         [org.openvoxproject/trapperkeeper "4.3.3-SNAPSHOT" :classifier "test"]
                          [org.openvoxproject/trapperkeeper-authorization "2.1.6"]
                          [org.openvoxproject/trapperkeeper-scheduler "1.3.1"]
-                         [org.openvoxproject/trapperkeeper-webserver-jetty10 "1.1.4"]]
+                         [org.openvoxproject/trapperkeeper-webserver-jetty12 "1.0.0-SNAPSHOT"]]
 
   :dependencies [[org.clojure/clojure]
                  [cheshire]
@@ -67,6 +67,6 @@
                                   [org.openvoxproject/http-client]
                                   [org.openvoxproject/kitchensink :classifier "test"]
                                   [org.openvoxproject/trapperkeeper :classifier "test"]
-                                  [org.openvoxproject/trapperkeeper-webserver-jetty10]]}}
+                                  [org.openvoxproject/trapperkeeper-webserver-jetty12]]}}
 
   :plugins [[org.openvoxproject/i18n ~i18n-version :hooks false]])
diff --git a/test/puppetlabs/trapperkeeper/services/status/status_proxy_service_test.clj b/test/puppetlabs/trapperkeeper/services/status/status_proxy_service_test.clj
index a8e5b70..c6a29ef 100644
--- a/test/puppetlabs/trapperkeeper/services/status/status_proxy_service_test.clj
+++ b/test/puppetlabs/trapperkeeper/services/status/status_proxy_service_test.clj
@@ -10,7 +10,7 @@
     [puppetlabs.trapperkeeper.services.status.status-proxy-service :refer [status-proxy-service]]
     [puppetlabs.trapperkeeper.services.webrouting.webrouting-service :as webrouting-service]
     [puppetlabs.trapperkeeper.services.scheduler.scheduler-service :as scheduler-service]
-    [puppetlabs.trapperkeeper.services.webserver.jetty10-service :as jetty10-service]))
+    [puppetlabs.trapperkeeper.services.webserver.jetty12-service :as jetty12-service]))
 
 (use-fixtures :once schema-test/validate-schemas)
 
@@ -55,7 +55,7 @@
     ; Start status service
     (with-app-with-config
       status-app
-      [jetty10-service/jetty10-service
+      [jetty12-service/jetty12-service
        webrouting-service/webrouting-service
        status-service
        foo-service
@@ -65,7 +65,7 @@
       ; Start the proxy service
       (with-app-with-config
         proxy-app
-        [jetty10-service/jetty10-service
+        [jetty12-service/jetty12-service
          webrouting-service/webrouting-service
          status-proxy-service]
         status-proxy-service-config
@@ -149,7 +149,7 @@
       (with-app-with-config
         ; Start status service
         status-app
-        [jetty10-service/jetty10-service
+        [jetty12-service/jetty12-service
          webrouting-service/webrouting-service
          status-service
          scheduler-service/scheduler-service
@@ -158,7 +158,7 @@
         ; Start the proxy service
         (with-app-with-config
           proxy-app
-          [jetty10-service/jetty10-service
+          [jetty12-service/jetty12-service
            webrouting-service/webrouting-service
            status-proxy-service]
           status-proxy-service-config
@@ -182,7 +182,7 @@
             (with-test-logging
               (with-app-with-config
                 proxy-app
-                [jetty10-service/jetty10-service
+                [jetty12-service/jetty12-service
                  webrouting-service/webrouting-service
                  status-proxy-service]
                 bad-config))))))
@@ -197,7 +197,7 @@
             (with-test-logging
               (with-app-with-config
                 proxy-app
-                [jetty10-service/jetty10-service
+                [jetty12-service/jetty12-service
                  webrouting-service/webrouting-service
                  status-proxy-service]
                 bad-config))))))
@@ -212,7 +212,7 @@
             (with-test-logging
               (with-app-with-config
                 proxy-app
-                [jetty10-service/jetty10-service
+                [jetty12-service/jetty12-service
                  webrouting-service/webrouting-service
                  status-proxy-service]
                 bad-config)))))))
diff --git a/test/puppetlabs/trapperkeeper/services/status/status_service_test.clj b/test/puppetlabs/trapperkeeper/services/status/status_service_test.clj
index f18ab94..402fb05 100644
--- a/test/puppetlabs/trapperkeeper/services/status/status_service_test.clj
+++ b/test/puppetlabs/trapperkeeper/services/status/status_service_test.clj
@@ -11,7 +11,7 @@
             [puppetlabs.trapperkeeper.services.status.status-core :as status-core]
             [puppetlabs.trapperkeeper.services.webrouting.webrouting-service :as webrouting-service]
             [puppetlabs.trapperkeeper.services.authorization.authorization-service :as tk-auth]
-            [puppetlabs.trapperkeeper.services.webserver.jetty10-service :as jetty10-service]
+            [puppetlabs.trapperkeeper.services.webserver.jetty12-service :as jetty12-service]
             [puppetlabs.trapperkeeper.services.scheduler.scheduler-service :as scheduler-service]
             [puppetlabs.kitchensink.core :as ks]))
 
@@ -47,13 +47,13 @@
   (:status (parse-response resp true)))
 
 (defmacro with-status-service-with-config
-  "Macro to start the status service and its dependencies (jetty10 and
+  "Macro to start the status service and its dependencies (jetty12 and
   webrouting service), along with any other services desired, with the given
   config"
   [app services config & body]
   `(with-app-with-config
      ~app
-     (concat [jetty10-service/jetty10-service
+     (concat [jetty12-service/jetty12-service
               webrouting-service/webrouting-service
               scheduler-service/scheduler-service
               status-service] ~services)
@@ -61,7 +61,7 @@
      (do ~@body)))
 
 (defmacro with-status-service
-  "Macro to start the status service and its dependencies (jetty10 and
+  "Macro to start the status service and its dependencies (jetty12 and
   webrouting service), along with any other services desired. Provides
   a default tk config"
   [app services & body]
@@ -126,7 +126,7 @@
 
 (deftest get-status-test
   (with-status-service app [foo-service
-                            jetty10-service/jetty10-service
+                            jetty12-service/jetty12-service
                             webrouting-service/webrouting-service
                             status-service]
     (let [svc (get-service app :StatusService)]
@@ -198,7 +198,7 @@
   (testing "can mount status endpoint at alternate location"
     (with-app-with-config
       app
-      [jetty10-service/jetty10-service
+      [jetty12-service/jetty12-service
        webrouting-service/webrouting-service
        scheduler-service/scheduler-service
        status-service]
@@ -211,7 +211,7 @@
   (testing "with auth service running and cert auth enabled for endpoint"
     (with-app-with-config
       app
-      [jetty10-service/jetty10-service
+      [jetty12-service/jetty12-service
        webrouting-service/webrouting-service
        scheduler-service/scheduler-service
        status-service
@@ -236,7 +236,7 @@
   (testing "with auth service running and cert auth disabled for endpoint"
     (with-app-with-config
       app
-      [jetty10-service/jetty10-service
+      [jetty12-service/jetty12-service
        webrouting-service/webrouting-service
        scheduler-service/scheduler-service
        status-service