diff --git a/orca-api-tck/orca-api-tck.gradle b/orca-api-tck/orca-api-tck.gradle
index 3bad8eef12..c85b607ddc 100644
--- a/orca-api-tck/orca-api-tck.gradle
+++ b/orca-api-tck/orca-api-tck.gradle
@@ -25,7 +25,6 @@ dependencies {
 
   // Test framework dependencies
   api("org.junit.jupiter:junit-jupiter-api")
-  api("org.junit.platform:junit-platform-runner")
 //  testImplementation "org.assertj:assertj-core"
   api("io.strikt:strikt-core")
   api("dev.minutest:minutest")
@@ -36,7 +35,6 @@ dependencies {
   api("org.springframework.security:spring-security-config")
   api("com.ninja-squad:springmockk")
 
-  testRuntimeOnly("org.junit.platform:junit-platform-launcher")
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
diff --git a/orca-api/orca-api.gradle b/orca-api/orca-api.gradle
index 707a856c79..a644afa4be 100644
--- a/orca-api/orca-api.gradle
+++ b/orca-api/orca-api.gradle
@@ -41,9 +41,6 @@ dependencies {
   compileOnly("org.projectlombok:lombok")
   annotationProcessor("org.projectlombok:lombok")
 
-  testRuntimeOnly("org.junit.jupiter:junit-jupiter-api")
-  testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
-
   dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.4.32")
 
   sampleImplementation(sourceSets.main.runtimeClasspath)
@@ -58,7 +55,5 @@ tasks.withType(JavaCompile) {
 }
 
 test {
-  useJUnitPlatform {
-    includeEngines "junit-vintage", "junit-jupiter"
-  }
+  useJUnitPlatform()
 }
diff --git a/orca-bakery/orca-bakery.gradle b/orca-bakery/orca-bakery.gradle
index 4e5e903c12..d74728ffcb 100644
--- a/orca-bakery/orca-bakery.gradle
+++ b/orca-bakery/orca-bakery.gradle
@@ -36,9 +36,12 @@ dependencies {
   testImplementation("com.github.tomakehurst:wiremock:2.15.0")
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testImplementation("org.assertj:assertj-core")
-  testImplementation("org.mockito:mockito-core:2.25.0")
+  testImplementation("org.mockito:mockito-core")
 
-  testRuntimeOnly("org.junit.jupiter:junit-jupiter-api")
+  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+}
+test {
+  useJUnitPlatform()
 }
 
 sourceSets {
diff --git a/orca-bakery/src/test/groovy/com/netflix/spinnaker/orca/bakery/api/BakeryServiceSpec.groovy b/orca-bakery/src/test/groovy/com/netflix/spinnaker/orca/bakery/api/BakeryServiceSpec.groovy
index 2b761ba203..ee3825f281 100644
--- a/orca-bakery/src/test/groovy/com/netflix/spinnaker/orca/bakery/api/BakeryServiceSpec.groovy
+++ b/orca-bakery/src/test/groovy/com/netflix/spinnaker/orca/bakery/api/BakeryServiceSpec.groovy
@@ -16,17 +16,17 @@
 
 package com.netflix.spinnaker.orca.bakery.api
 
-import com.github.tomakehurst.wiremock.junit.WireMockRule
+import org.junit.jupiter.api.AfterAll
+import org.junit.jupiter.api.BeforeAll
+import com.github.tomakehurst.wiremock.WireMockServer
 import com.netflix.spinnaker.orca.bakery.config.BakeryConfiguration
 import com.netflix.spinnaker.orca.jackson.OrcaObjectMapper
-import org.junit.Rule
 import retrofit.RequestInterceptor
 import retrofit.RetrofitError
 import retrofit.client.OkClient
 import spock.lang.Specification
 import spock.lang.Subject
 import static com.github.tomakehurst.wiremock.client.WireMock.*
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig
 import static com.google.common.net.HttpHeaders.LOCATION
 import static java.net.HttpURLConnection.*
 import static retrofit.Endpoints.newFixedEndpoint
@@ -34,8 +34,7 @@ import static retrofit.RestAdapter.LogLevel.FULL
 
 class BakeryServiceSpec extends Specification {
 
-  @Rule
-  public WireMockRule wireMockRule = new WireMockRule(wireMockConfig().dynamicPort())
+  public WireMockServer wireMockServer = new WireMockServer()
 
   @Subject BakeryService bakery
 
@@ -51,16 +50,23 @@ class BakeryServiceSpec extends Specification {
 
   def mapper = OrcaObjectMapper.newInstance()
 
+  @BeforeAll
   def setup() {
-    bakeURI = wireMockRule.url(bakePath)
-    statusURI = wireMockRule.url(statusPath)
+    wireMockServer.start()
+    bakeURI = wireMockServer.url(bakePath)
+    statusURI = wireMockServer.url(statusPath)
 
     bakery = new BakeryConfiguration(
       retrofitClient: new OkClient(),
       retrofitLogLevel: FULL,
       spinnakerRequestInterceptor: Mock(RequestInterceptor)
     )
-      .buildService(wireMockRule.url("/"))
+      .buildService(wireMockServer.url("/"))
+  }
+
+  @AfterAll
+  def cleanup() {
+    wireMockServer.stop()
   }
 
   def "can lookup a bake status"() {
diff --git a/orca-bakery/src/test/java/com/netflix/spinnaker/orca/bakery/tasks/manifests/cf/BakeCloudFoundryManifestTaskTest.java b/orca-bakery/src/test/java/com/netflix/spinnaker/orca/bakery/tasks/manifests/cf/BakeCloudFoundryManifestTaskTest.java
index e512d76862..e1dc7f32bc 100644
--- a/orca-bakery/src/test/java/com/netflix/spinnaker/orca/bakery/tasks/manifests/cf/BakeCloudFoundryManifestTaskTest.java
+++ b/orca-bakery/src/test/java/com/netflix/spinnaker/orca/bakery/tasks/manifests/cf/BakeCloudFoundryManifestTaskTest.java
@@ -34,7 +34,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BakeCloudFoundryManifestTaskTest {
 
diff --git a/orca-clouddriver-provider-titus/orca-clouddriver-provider-titus.gradle b/orca-clouddriver-provider-titus/orca-clouddriver-provider-titus.gradle
index d7c44be840..6d92cb0d56 100644
--- a/orca-clouddriver-provider-titus/orca-clouddriver-provider-titus.gradle
+++ b/orca-clouddriver-provider-titus/orca-clouddriver-provider-titus.gradle
@@ -17,9 +17,7 @@
 apply from: "$rootDir/gradle/groovy.gradle"
 
 test {
-  useJUnitPlatform {
-    includeEngines "junit-vintage", "junit-jupiter"
-  }
+  useJUnitPlatform()
 }
 
 dependencies {
@@ -30,6 +28,5 @@ dependencies {
   testImplementation(project(":orca-test"))
   testImplementation(project(":orca-test-groovy"))
 
-  testRuntimeOnly("org.junit.jupiter:junit-jupiter-api")
-  testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
+  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
diff --git a/orca-clouddriver/orca-clouddriver.gradle b/orca-clouddriver/orca-clouddriver.gradle
index f80f1bc443..efd58a3ba7 100644
--- a/orca-clouddriver/orca-clouddriver.gradle
+++ b/orca-clouddriver/orca-clouddriver.gradle
@@ -18,9 +18,7 @@ apply from: "$rootDir/gradle/groovy.gradle"
 apply from: "$rootDir/gradle/kotlin.gradle"
 
 test {
-  useJUnitPlatform {
-    includeEngines "junit-vintage", "junit-jupiter"
-  }
+  useJUnitPlatform()
 }
 
 dependencies {
@@ -53,9 +51,7 @@ dependencies {
   testImplementation("com.github.tomakehurst:wiremock:2.15.0")
   testImplementation("org.springframework:spring-test")
   testImplementation("org.junit.jupiter:junit-jupiter-api")
-  testImplementation("org.junit.platform:junit-platform-runner")
   testImplementation("org.assertj:assertj-core")
-  testImplementation("org.mockito:mockito-core:2.25.0")
   testImplementation("org.mockito:mockito-junit-jupiter")
   testImplementation("io.spinnaker.fiat:fiat-core:$fiatVersion")
   testImplementation("dev.minutest:minutest")
@@ -66,8 +62,7 @@ dependencies {
   testCompileOnly("org.projectlombok:lombok")
   testAnnotationProcessor("org.projectlombok:lombok")
 
-  testRuntimeOnly("org.junit.jupiter:junit-jupiter-api")
-  testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
+  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
 sourceSets {
diff --git a/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/KatoRestServiceSpec.groovy b/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/KatoRestServiceSpec.groovy
index 7181156623..9a853baeab 100644
--- a/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/KatoRestServiceSpec.groovy
+++ b/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/KatoRestServiceSpec.groovy
@@ -16,7 +16,7 @@
 
 package com.netflix.spinnaker.orca.clouddriver
 
-import com.github.tomakehurst.wiremock.junit.WireMockRule
+import com.github.tomakehurst.wiremock.WireMockServer
 import com.netflix.spinnaker.config.ServiceEndpoint
 import com.netflix.spinnaker.config.okhttp3.OkHttpClientBuilderProvider
 import com.netflix.spinnaker.config.okhttp3.OkHttpClientProvider
@@ -24,21 +24,20 @@ import com.netflix.spinnaker.orca.clouddriver.config.CloudDriverConfiguration
 import com.netflix.spinnaker.orca.clouddriver.config.CloudDriverConfigurationProperties
 import com.netflix.spinnaker.orca.jackson.OrcaObjectMapper
 import okhttp3.OkHttpClient
-import org.junit.Rule
+import org.junit.jupiter.api.AfterAll
+import org.junit.jupiter.api.BeforeAll
 import retrofit.RequestInterceptor
 import retrofit.client.OkClient
 import spock.lang.Specification
 import spock.lang.Subject
 import static com.github.tomakehurst.wiremock.client.WireMock.*
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig
 import static java.net.HttpURLConnection.HTTP_ACCEPTED
 import static java.net.HttpURLConnection.HTTP_OK
 import static retrofit.RestAdapter.LogLevel.FULL
 
 class KatoRestServiceSpec extends Specification {
 
-  @Rule
-  public WireMockRule wireMockRule = new WireMockRule(wireMockConfig().dynamicPort())
+  public WireMockServer wireMockServer = new WireMockServer()
 
   @Subject
   KatoRestService service
@@ -57,7 +56,9 @@ class KatoRestServiceSpec extends Specification {
 
   private static final taskId = "e1jbn3"
 
+  @BeforeAll
   def setup() {
+    wireMockServer.start()
     def cfg = new CloudDriverConfiguration()
     def builder = cfg.clouddriverRetrofitBuilder(
       mapper,
@@ -73,11 +74,16 @@ class KatoRestServiceSpec extends Specification {
       }]),
       FULL,
       noopInterceptor,
-      new CloudDriverConfigurationProperties(clouddriver: new CloudDriverConfigurationProperties.CloudDriver(baseUrl: wireMockRule.url("/"))))
+      new CloudDriverConfigurationProperties(clouddriver: new CloudDriverConfigurationProperties.CloudDriver(baseUrl: wireMockServer.url("/"))))
     service = cfg.katoDeployService(builder)
     taskStatusService = cfg.cloudDriverTaskStatusService(builder)
   }
 
+  @AfterAll
+  def cleanup() {
+    wireMockServer.stop()
+  }
+
   def "can interpret the response from an operation request"() {
     given: "kato accepts an operations request"
     stubFor(
diff --git a/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/model/ManifestTest.java b/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/model/ManifestTest.java
index 36914bc34e..b486a88bbe 100644
--- a/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/model/ManifestTest.java
+++ b/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/model/ManifestTest.java
@@ -25,10 +25,7 @@
 import java.io.IOException;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
-@RunWith(JUnitPlatform.class)
 final class ManifestTest {
   private static final ObjectMapper objectMapper = OrcaObjectMapper.newInstance();
 
diff --git a/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/pipeline/cluster/ShrinkClusterStageTest.java b/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/pipeline/cluster/ShrinkClusterStageTest.java
index 9baf47f746..6941b90d99 100644
--- a/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/pipeline/cluster/ShrinkClusterStageTest.java
+++ b/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/pipeline/cluster/ShrinkClusterStageTest.java
@@ -30,10 +30,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
-@RunWith(JUnitPlatform.class)
 public class ShrinkClusterStageTest {
 
   private PipelineExecutionImpl pipeline;
diff --git a/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/tasks/job/WaitOnJobCompletionTest.java b/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/tasks/job/WaitOnJobCompletionTest.java
index 41c5c6e3e2..644674460e 100644
--- a/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/tasks/job/WaitOnJobCompletionTest.java
+++ b/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/tasks/job/WaitOnJobCompletionTest.java
@@ -19,7 +19,9 @@
 import static com.netflix.spinnaker.orca.TestUtils.getResource;
 import static com.netflix.spinnaker.orca.TestUtils.getResourceAsStream;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
@@ -51,12 +53,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import retrofit.client.Response;
 import retrofit.mime.TypedByteArray;
 
-@RunWith(JUnitPlatform.class)
 public final class WaitOnJobCompletionTest {
   private ObjectMapper objectMapper;
   private RetrySupport retrySupport;
diff --git a/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/tasks/manifest/ResolveDeploySourceManifestTaskTest.java b/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/tasks/manifest/ResolveDeploySourceManifestTaskTest.java
index b3a6d38d3d..e7d4a59260 100644
--- a/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/tasks/manifest/ResolveDeploySourceManifestTaskTest.java
+++ b/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/tasks/manifest/ResolveDeploySourceManifestTaskTest.java
@@ -28,10 +28,7 @@
 import com.netflix.spinnaker.orca.pipeline.model.StageExecutionImpl;
 import java.util.*;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
-@RunWith(JUnitPlatform.class)
 final class ResolveDeploySourceManifestTaskTest {
 
   private static final Map<Object, Object> MANIFEST_1 =
diff --git a/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/tasks/manifest/WaitForManifestStableTaskTest.java b/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/tasks/manifest/WaitForManifestStableTaskTest.java
index 892bccc5c8..27da49716b 100644
--- a/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/tasks/manifest/WaitForManifestStableTaskTest.java
+++ b/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/tasks/manifest/WaitForManifestStableTaskTest.java
@@ -34,10 +34,7 @@
 import java.util.Optional;
 import org.assertj.core.api.AssertionsForClassTypes;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
-@RunWith(JUnitPlatform.class)
 final class WaitForManifestStableTaskTest {
   private static final String UNSTABLE_MESSAGE = "manifest is unstable";
   private static final String FAILED_MESSAGE = "manifest failed";
diff --git a/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/tasks/providers/appengine/DeployAppEngineConfigurationTaskTest.java b/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/tasks/providers/appengine/DeployAppEngineConfigurationTaskTest.java
index 1d4d043a2e..370167f3b7 100644
--- a/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/tasks/providers/appengine/DeployAppEngineConfigurationTaskTest.java
+++ b/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/tasks/providers/appengine/DeployAppEngineConfigurationTaskTest.java
@@ -18,8 +18,8 @@
 
 import static com.netflix.spinnaker.orca.api.pipeline.models.ExecutionType.PIPELINE;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -36,7 +36,7 @@
 import com.netflix.spinnaker.orca.pipeline.model.StageExecutionImpl;
 import com.netflix.spinnaker.orca.pipeline.util.ArtifactUtils;
 import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DeployAppEngineConfigurationTaskTest {
   private final String CLOUD_OPERATION_TYPE = "deployAppengineConfiguration";
diff --git a/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/tasks/artifacts/FindArtifactFromPipelineExecutionTaskTest.java b/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/tasks/artifacts/FindArtifactFromPipelineExecutionTaskTest.java
index d3cf15d502..e4e95ce408 100644
--- a/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/tasks/artifacts/FindArtifactFromPipelineExecutionTaskTest.java
+++ b/orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/tasks/artifacts/FindArtifactFromPipelineExecutionTaskTest.java
@@ -33,10 +33,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
-@RunWith(JUnitPlatform.class)
 final class FindArtifactFromPipelineExecutionTaskTest {
   private static final String PIPELINE = "my pipeline";
   private static final Artifact ARTIFACT_A =
diff --git a/orca-core/orca-core.gradle b/orca-core/orca-core.gradle
index ffeedc7027..98b0796013 100644
--- a/orca-core/orca-core.gradle
+++ b/orca-core/orca-core.gradle
@@ -64,12 +64,10 @@ dependencies {
   testImplementation(project(":orca-test-groovy"))
   testImplementation("com.github.tomakehurst:wiremock:2.15.0")
   testImplementation("org.junit.jupiter:junit-jupiter-api")
-  testImplementation("org.junit.platform:junit-platform-runner")
   testImplementation("org.assertj:assertj-core")
   testImplementation("org.mockito:mockito-core")
   testImplementation("org.mockito:mockito-junit-jupiter")
   testImplementation("org.springframework.boot:spring-boot-starter-test")
 
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-api")
-  testRuntimeOnly "org.junit.vintage:junit-vintage-engine"
 }
diff --git a/orca-core/src/test/java/com/netflix/spinnaker/orca/pipeline/CompoundExecutionOperatorTest.java b/orca-core/src/test/java/com/netflix/spinnaker/orca/pipeline/CompoundExecutionOperatorTest.java
index 46322a41bf..a3220b5053 100644
--- a/orca-core/src/test/java/com/netflix/spinnaker/orca/pipeline/CompoundExecutionOperatorTest.java
+++ b/orca-core/src/test/java/com/netflix/spinnaker/orca/pipeline/CompoundExecutionOperatorTest.java
@@ -35,10 +35,7 @@
 import java.util.List;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
-@RunWith(JUnitPlatform.class)
 final class CompoundExecutionOperatorTest {
   private static final String APPLICATION = "myapp";
   private static final String PIPELINE = "mypipeline";
diff --git a/orca-core/src/test/java/com/netflix/spinnaker/orca/pipeline/persistence/PipelineExecutionRepositoryTest.java b/orca-core/src/test/java/com/netflix/spinnaker/orca/pipeline/persistence/PipelineExecutionRepositoryTest.java
index 134f5a1be5..1e7e52964d 100644
--- a/orca-core/src/test/java/com/netflix/spinnaker/orca/pipeline/persistence/PipelineExecutionRepositoryTest.java
+++ b/orca-core/src/test/java/com/netflix/spinnaker/orca/pipeline/persistence/PipelineExecutionRepositoryTest.java
@@ -23,10 +23,7 @@
 import com.netflix.spinnaker.orca.api.pipeline.models.ExecutionType;
 import com.netflix.spinnaker.orca.pipeline.model.PipelineExecutionImpl;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
-@RunWith(JUnitPlatform.class)
 final class PipelineExecutionRepositoryTest {
   private static final String APPLICATION = "myapp";
 
diff --git a/orca-core/src/test/java/com/netflix/spinnaker/orca/pipeline/util/ArtifactResolverTest.java b/orca-core/src/test/java/com/netflix/spinnaker/orca/pipeline/util/ArtifactResolverTest.java
index 68baa92a3d..7e2641e835 100644
--- a/orca-core/src/test/java/com/netflix/spinnaker/orca/pipeline/util/ArtifactResolverTest.java
+++ b/orca-core/src/test/java/com/netflix/spinnaker/orca/pipeline/util/ArtifactResolverTest.java
@@ -25,10 +25,7 @@
 import com.netflix.spinnaker.kork.web.exceptions.InvalidRequestException;
 import com.netflix.spinnaker.orca.pipeline.util.ArtifactResolver.ResolveResult;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
-@RunWith(JUnitPlatform.class)
 final class ArtifactResolverTest {
   private static final Artifact DOCKER_ARTIFACT =
       Artifact.builder().name("my-docker-image").type("docker/image").build();
diff --git a/orca-core/src/test/java/com/netflix/spinnaker/orca/pipeline/util/ArtifactUtilsTest.java b/orca-core/src/test/java/com/netflix/spinnaker/orca/pipeline/util/ArtifactUtilsTest.java
index 5bebe20b4d..193ff36bb3 100644
--- a/orca-core/src/test/java/com/netflix/spinnaker/orca/pipeline/util/ArtifactUtilsTest.java
+++ b/orca-core/src/test/java/com/netflix/spinnaker/orca/pipeline/util/ArtifactUtilsTest.java
@@ -31,10 +31,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
-@RunWith(JUnitPlatform.class)
 final class ArtifactUtilsTest {
   @Test
   void withAccountNonNullAccount() {
diff --git a/orca-core/src/test/java/com/netflix/spinnaker/orca/pipeline/util/HttpClientUtilsTest.java b/orca-core/src/test/java/com/netflix/spinnaker/orca/pipeline/util/HttpClientUtilsTest.java
index a1d44814d7..4e8511345f 100644
--- a/orca-core/src/test/java/com/netflix/spinnaker/orca/pipeline/util/HttpClientUtilsTest.java
+++ b/orca-core/src/test/java/com/netflix/spinnaker/orca/pipeline/util/HttpClientUtilsTest.java
@@ -21,17 +21,12 @@
 
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.http.Fault;
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
 import com.netflix.spinnaker.orca.config.UserConfiguredUrlRestrictions;
 import java.io.IOException;
-import org.junit.Rule;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
-@RunWith(JUnitPlatform.class)
 public class HttpClientUtilsTest {
 
   private final String host = "localhost";
@@ -42,8 +37,6 @@ public class HttpClientUtilsTest {
 
   WireMockServer wireMockServer = new WireMockServer();
 
-  @Rule public WireMockRule wireMockRule = new WireMockRule(port);
-
   @BeforeEach
   public void setup() {
     wireMockServer.start();
diff --git a/orca-kayenta/src/test/java/com/netflix/spinnaker/orca/kayenta/pipeline/functions/KayentaConfigExpressionFunctionProviderTest.java b/orca-kayenta/src/test/java/com/netflix/spinnaker/orca/kayenta/pipeline/functions/KayentaConfigExpressionFunctionProviderTest.java
index 9d39e06d3b..909cb72e3e 100644
--- a/orca-kayenta/src/test/java/com/netflix/spinnaker/orca/kayenta/pipeline/functions/KayentaConfigExpressionFunctionProviderTest.java
+++ b/orca-kayenta/src/test/java/com/netflix/spinnaker/orca/kayenta/pipeline/functions/KayentaConfigExpressionFunctionProviderTest.java
@@ -1,5 +1,7 @@
 package com.netflix.spinnaker.orca.kayenta.pipeline.functions;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.when;
 
 import com.google.common.collect.Lists;
@@ -8,24 +10,25 @@
 import com.netflix.spinnaker.orca.kayenta.KayentaService;
 import java.util.Collections;
 import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 public class KayentaConfigExpressionFunctionProviderTest {
 
-  @Test(expected = SpelHelperFunctionException.class)
+  @Test
   public void missingName() {
     KayentaConfigExpressionFunctionProvider provider =
         new KayentaConfigExpressionFunctionProvider(Mockito.mock(KayentaService.class));
-    provider.canaryConfigNameToId(null, "myapp");
+    assertThrows(
+        SpelHelperFunctionException.class, () -> provider.canaryConfigNameToId(null, "myapp"));
   }
 
-  @Test(expected = SpelHelperFunctionException.class)
+  @Test
   public void missingApp() {
     KayentaConfigExpressionFunctionProvider provider =
         new KayentaConfigExpressionFunctionProvider(Mockito.mock(KayentaService.class));
-    provider.canaryConfigNameToId("myname", null);
+    assertThrows(
+        SpelHelperFunctionException.class, () -> provider.canaryConfigNameToId("myname", null));
   }
 
   @Test
@@ -41,10 +44,10 @@ public void conversionWorks() {
         new KayentaConfigExpressionFunctionProvider(kayentaService);
     String configId = provider.canaryConfigNameToId("myname", "myapp");
 
-    Assert.assertEquals("myconfig", configId);
+    assertEquals("myconfig", configId);
   }
 
-  @Test(expected = SpelHelperFunctionException.class)
+  @Test
   public void nothingFound() {
     KayentaService kayentaService = Mockito.mock(KayentaService.class);
     List<KayentaCanaryConfig> canaryConfigs = Lists.newArrayList();
@@ -55,6 +58,8 @@ public void nothingFound() {
 
     KayentaConfigExpressionFunctionProvider provider =
         new KayentaConfigExpressionFunctionProvider(kayentaService);
-    provider.canaryConfigNameToId("someothername", "myapp");
+    assertThrows(
+        SpelHelperFunctionException.class,
+        () -> provider.canaryConfigNameToId("someothername", "myapp"));
   }
 }
diff --git a/orca-plugins-test/orca-plugins-test.gradle b/orca-plugins-test/orca-plugins-test.gradle
index aa0a42a394..4bc3f6f1d9 100644
--- a/orca-plugins-test/orca-plugins-test.gradle
+++ b/orca-plugins-test/orca-plugins-test.gradle
@@ -30,7 +30,6 @@ dependencies {
   testImplementation("com.fasterxml.jackson.dataformat:jackson-dataformat-properties")
   testImplementation "com.fasterxml.jackson.module:jackson-module-kotlin"
 
-  testRuntimeOnly("org.junit.platform:junit-platform-launcher")
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
@@ -39,7 +38,5 @@ test {
     includeTestsMatching "com.netflix.spinnaker.orca.plugins.test.OrcaPluginsTest"
   }
 
-  useJUnitPlatform {
-    includeEngines("junit-jupiter", "junit-vintage")
-  }
+  useJUnitPlatform()
 }
diff --git a/orca-queue-redis/src/test/kotlin/com/netflix/spinnaker/orca/q/redis/RedisQueueIntegrationTest.kt b/orca-queue-redis/src/test/kotlin/com/netflix/spinnaker/orca/q/redis/RedisQueueIntegrationTest.kt
index 95dba34b06..4245a2492d 100644
--- a/orca-queue-redis/src/test/kotlin/com/netflix/spinnaker/orca/q/redis/RedisQueueIntegrationTest.kt
+++ b/orca-queue-redis/src/test/kotlin/com/netflix/spinnaker/orca/q/redis/RedisQueueIntegrationTest.kt
@@ -27,11 +27,11 @@ import com.netflix.spinnaker.orca.q.QueueIntegrationTest
 import com.netflix.spinnaker.orca.q.TestConfig
 import com.netflix.spinnaker.orca.q.redis.pending.RedisPendingExecutionService
 import com.netflix.spinnaker.orca.test.redis.EmbeddedRedisConfiguration
-import org.junit.runner.RunWith
+import org.junit.jupiter.api.extension.ExtendWith
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
-import org.springframework.test.context.junit4.SpringRunner
+import org.springframework.test.context.junit.jupiter.SpringExtension
 import redis.clients.jedis.Jedis
 import redis.clients.jedis.util.Pool
 
@@ -52,7 +52,7 @@ class RedisTestConfig {
 /**
  * This just runs [QueueIntegrationTest] with a [com.netflix.spinnaker.q.redis.RedisQueue].
  */
-@RunWith(SpringRunner::class)
+@ExtendWith(SpringExtension::class)
 @SpringBootTest(
   classes = [
     EmbeddedRedisConfiguration::class,
diff --git a/orca-queue-sql/src/test/kotlin/com/netflix/spinnaker/orca/q/sql/SqlQueueIntegrationTest.kt b/orca-queue-sql/src/test/kotlin/com/netflix/spinnaker/orca/q/sql/SqlQueueIntegrationTest.kt
index 7bbf902984..462694dcd0 100644
--- a/orca-queue-sql/src/test/kotlin/com/netflix/spinnaker/orca/q/sql/SqlQueueIntegrationTest.kt
+++ b/orca-queue-sql/src/test/kotlin/com/netflix/spinnaker/orca/q/sql/SqlQueueIntegrationTest.kt
@@ -52,12 +52,12 @@ import java.time.Clock
 import java.time.Duration
 import java.util.Optional
 import org.jooq.DSLContext
-import org.junit.runner.RunWith
+import org.junit.jupiter.api.extension.ExtendWith
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
-import org.springframework.test.context.junit4.SpringRunner
+import org.springframework.test.context.junit.jupiter.SpringExtension
 
 @Configuration
 class SqlTestConfig {
@@ -163,7 +163,7 @@ class SqlTestConfig {
     RedisClientSelector(redisClientDelegates)
 }
 
-@RunWith(SpringRunner::class)
+@ExtendWith(SpringExtension::class)
 @SpringBootTest(
   classes = [
     SqlTestConfig::class,
diff --git a/orca-queue-tck/src/main/kotlin/com/netflix/spinnaker/orca/q/QueueIntegrationTest.kt b/orca-queue-tck/src/main/kotlin/com/netflix/spinnaker/orca/q/QueueIntegrationTest.kt
index eade4dfc27..8273700452 100644
--- a/orca-queue-tck/src/main/kotlin/com/netflix/spinnaker/orca/q/QueueIntegrationTest.kt
+++ b/orca-queue-tck/src/main/kotlin/com/netflix/spinnaker/orca/q/QueueIntegrationTest.kt
@@ -73,10 +73,11 @@ import java.time.Instant.now
 import java.time.ZoneId
 import java.time.temporal.ChronoUnit.HOURS
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
+import org.junit.jupiter.api.AfterAll
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.ExtendWith
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.beans.factory.annotation.Value
@@ -90,7 +91,7 @@ import org.springframework.context.annotation.Import
 import org.springframework.context.event.ApplicationEventMulticaster
 import org.springframework.context.event.SimpleApplicationEventMulticaster
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor
-import org.springframework.test.context.junit4.SpringRunner
+import org.springframework.test.context.junit.jupiter.SpringExtension
 import java.util.concurrent.TimeUnit
 import java.util.function.Predicate
 
@@ -98,7 +99,7 @@ import java.util.function.Predicate
   classes = [TestConfig::class],
   properties = ["queue.retry.delay.ms=10"]
 )
-@RunWith(SpringRunner::class)
+@ExtendWith(SpringExtension::class)
 abstract class QueueIntegrationTest {
 
   @Autowired
@@ -116,17 +117,17 @@ abstract class QueueIntegrationTest {
   lateinit var timeZoneId: String
   private val timeZone by lazy { ZoneId.of(timeZoneId) }
 
-  @Before
+  @BeforeEach
   fun discoveryUp() {
     context.publishEvent(RemoteStatusChangedEvent(DiscoveryStatusChangeEvent(InstanceStatus.STARTING, InstanceStatus.UP)))
   }
 
-  @After
+  @AfterEach
   fun discoveryDown() {
     context.publishEvent(RemoteStatusChangedEvent(DiscoveryStatusChangeEvent(InstanceStatus.UP, InstanceStatus.OUT_OF_SERVICE)))
   }
 
-  @After
+  @AfterEach
   fun resetMocks() {
     reset(dummyTask)
     whenever(dummyTask.extensionClass) doReturn dummyTask::class.java
diff --git a/orca-sql/orca-sql.gradle b/orca-sql/orca-sql.gradle
index 5f3c2d76f0..6ebf24738f 100644
--- a/orca-sql/orca-sql.gradle
+++ b/orca-sql/orca-sql.gradle
@@ -53,12 +53,8 @@ dependencies {
   testRuntimeOnly("mysql:mysql-connector-java")
   testRuntimeOnly("org.postgresql:postgresql")
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-  testRuntimeOnly("org.junit.platform:junit-platform-launcher")
-  testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
 }
 
 test {
-  useJUnitPlatform {
-    includeEngines "junit-vintage", "junit-jupiter"
-  }
+  useJUnitPlatform()
 }
diff --git a/orca-web/orca-web.gradle b/orca-web/orca-web.gradle
index df07321558..4af90ed53b 100644
--- a/orca-web/orca-web.gradle
+++ b/orca-web/orca-web.gradle
@@ -110,7 +110,5 @@ test {
       }
     }
   }
-  useJUnitPlatform {
-    includeEngines("junit-jupiter", "junit-vintage")
-  }
+  useJUnitPlatform()
 }
diff --git a/orca-web/src/test/groovy/com/netflix/spinnaker/orca/MainSpec.java b/orca-web/src/test/groovy/com/netflix/spinnaker/orca/MainSpec.java
index d24cb1ab02..29b0fafbc9 100644
--- a/orca-web/src/test/groovy/com/netflix/spinnaker/orca/MainSpec.java
+++ b/orca-web/src/test/groovy/com/netflix/spinnaker/orca/MainSpec.java
@@ -18,15 +18,15 @@
 
 import com.netflix.spinnaker.orca.notifications.NotificationClusterLock;
 import com.netflix.spinnaker.orca.pipeline.persistence.ExecutionRepository;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = {Main.class})
 @ContextConfiguration(classes = {StartupTestConfiguration.class})
 @TestPropertySource(properties = {"spring.config.location=classpath:orca-test.yml"})
diff --git a/orca-web/src/test/java/com/netflix/spinnaker/orca/MeterRegistryProcessorIntTest.java b/orca-web/src/test/java/com/netflix/spinnaker/orca/MeterRegistryProcessorIntTest.java
index 2d9479195e..40315310cd 100644
--- a/orca-web/src/test/java/com/netflix/spinnaker/orca/MeterRegistryProcessorIntTest.java
+++ b/orca-web/src/test/java/com/netflix/spinnaker/orca/MeterRegistryProcessorIntTest.java
@@ -19,17 +19,17 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import io.micrometer.core.instrument.MeterRegistry;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = {Main.class})
 @ContextConfiguration(classes = {MeterRegistryProcessorTestConfiguration.class})
 @TestPropertySource(