diff --git a/errorprone-checks/build.gradle b/errorprone-checks/build.gradle
index 805e513d2..1aff3a23b 100644
--- a/errorprone-checks/build.gradle
+++ b/errorprone-checks/build.gradle
@@ -35,7 +35,6 @@ dependencies {
   implementation 'info.picocli:picocli'
 
   testImplementation 'com.google.errorprone:error_prone_test_helpers'
-  testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
   testImplementation 'org.junit.jupiter:junit-jupiter'
 
diff --git a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/BannedMethodTest.java b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/BannedMethodTest.java
index 66e29f370..48f382946 100644
--- a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/BannedMethodTest.java
+++ b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/BannedMethodTest.java
@@ -15,14 +15,14 @@
 package org.hyperledger.errorpronechecks;
 
 import com.google.errorprone.CompilationTestHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class BannedMethodTest {
 
   private CompilationTestHelper compilationHelper;
 
-  @Before
+  @BeforeEach
   public void setup() {
     compilationHelper = CompilationTestHelper.newInstance(BannedMethod.class, getClass());
   }
diff --git a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotCreateSecureRandomDirectlyTest.java b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotCreateSecureRandomDirectlyTest.java
index 60e86751f..525f5a868 100644
--- a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotCreateSecureRandomDirectlyTest.java
+++ b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotCreateSecureRandomDirectlyTest.java
@@ -15,14 +15,14 @@
 package org.hyperledger.errorpronechecks;
 
 import com.google.errorprone.CompilationTestHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class DoNotCreateSecureRandomDirectlyTest {
 
   private CompilationTestHelper compilationHelper;
 
-  @Before
+  @BeforeEach
   public void setup() {
     compilationHelper =
         CompilationTestHelper.newInstance(DoNotCreateSecureRandomDirectly.class, getClass());
diff --git a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotInvokeMessageDigestDirectlyTest.java b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotInvokeMessageDigestDirectlyTest.java
index 0b045bcd9..986aedb63 100644
--- a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotInvokeMessageDigestDirectlyTest.java
+++ b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotInvokeMessageDigestDirectlyTest.java
@@ -15,14 +15,14 @@
 package org.hyperledger.errorpronechecks;
 
 import com.google.errorprone.CompilationTestHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class DoNotInvokeMessageDigestDirectlyTest {
 
   private CompilationTestHelper compilationHelper;
 
-  @Before
+  @BeforeEach
   public void setup() {
     compilationHelper =
         CompilationTestHelper.newInstance(DoNotInvokeMessageDigestDirectly.class, getClass());
diff --git a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotReturnNullOptionalsTest.java b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotReturnNullOptionalsTest.java
index e8d622706..0055c9fc1 100644
--- a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotReturnNullOptionalsTest.java
+++ b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotReturnNullOptionalsTest.java
@@ -15,14 +15,14 @@
 package org.hyperledger.errorpronechecks;
 
 import com.google.errorprone.CompilationTestHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class DoNotReturnNullOptionalsTest {
 
   private CompilationTestHelper compilationHelper;
 
-  @Before
+  @BeforeEach
   public void setup() {
     compilationHelper =
         CompilationTestHelper.newInstance(DoNotReturnNullOptionals.class, getClass());
diff --git a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/ExperimentalCliOptionMustBeCorrectlyDisplayedTest.java b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/ExperimentalCliOptionMustBeCorrectlyDisplayedTest.java
index edfcded0d..159c3905e 100644
--- a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/ExperimentalCliOptionMustBeCorrectlyDisplayedTest.java
+++ b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/ExperimentalCliOptionMustBeCorrectlyDisplayedTest.java
@@ -15,14 +15,14 @@
 package org.hyperledger.errorpronechecks;
 
 import com.google.errorprone.CompilationTestHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ExperimentalCliOptionMustBeCorrectlyDisplayedTest {
 
   private CompilationTestHelper compilationHelper;
 
-  @Before
+  @BeforeEach
   public void setup() {
     compilationHelper =
         CompilationTestHelper.newInstance(
diff --git a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalTest.java b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalTest.java
index 2c1802d7d..f94fa2d60 100644
--- a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalTest.java
+++ b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalTest.java
@@ -15,14 +15,14 @@
 package org.hyperledger.errorpronechecks;
 
 import com.google.errorprone.CompilationTestHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class MethodInputParametersMustBeFinalTest {
 
   private CompilationTestHelper compilationHelper;
 
-  @Before
+  @BeforeEach
   public void setup() {
     compilationHelper =
         CompilationTestHelper.newInstance(MethodInputParametersMustBeFinal.class, getClass());
diff --git a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/PrivateStaticFinalLoggersTest.java b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/PrivateStaticFinalLoggersTest.java
index c8f246c38..f15dabca1 100644
--- a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/PrivateStaticFinalLoggersTest.java
+++ b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/PrivateStaticFinalLoggersTest.java
@@ -15,14 +15,14 @@
 package org.hyperledger.errorpronechecks;
 
 import com.google.errorprone.CompilationTestHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class PrivateStaticFinalLoggersTest {
 
   private CompilationTestHelper compilationHelper;
 
-  @Before
+  @BeforeEach
   public void setup() {
     compilationHelper =
         CompilationTestHelper.newInstance(PrivateStaticFinalLoggers.class, getClass());