diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/auth/grpc/ProhibitAuthenticationInterceptorTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/auth/grpc/ProhibitAuthenticationInterceptorTest.java
index 189af0bd0..31ecfd1f8 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/auth/grpc/ProhibitAuthenticationInterceptorTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/auth/grpc/ProhibitAuthenticationInterceptorTest.java
@@ -15,9 +15,9 @@ import org.whispersystems.textsecuregcm.grpc.EchoServiceImpl;
 
 import java.util.concurrent.TimeUnit;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class ProhibitAuthenticationInterceptorTest  {
   private Server server;
@@ -53,7 +53,7 @@ class ProhibitAuthenticationInterceptorTest  {
 
     final StatusRuntimeException e = assertThrows(StatusRuntimeException.class,
         () -> client.echo(EchoRequest.getDefaultInstance()));
-    assertEquals(e.getStatus().getCode(), Status.Code.UNAUTHENTICATED);
+    assertEquals(Status.Code.UNAUTHENTICATED, e.getStatus().getCode());
   }
 
   @Test
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/auth/grpc/RequireAuthenticationInterceptorTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/auth/grpc/RequireAuthenticationInterceptorTest.java
index 90bb86f79..3398fe906 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/auth/grpc/RequireAuthenticationInterceptorTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/auth/grpc/RequireAuthenticationInterceptorTest.java
@@ -1,7 +1,7 @@
 package org.whispersystems.textsecuregcm.auth.grpc;
 
-import static org.junit.Assert.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
@@ -18,7 +18,6 @@ import java.time.Instant;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
-import org.junit.Assert;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -72,7 +71,7 @@ class RequireAuthenticationInterceptorTest {
 
     final GetAuthenticatedDeviceResponse authenticatedDevice = client.getAuthenticatedDevice(
         GetAuthenticatedDeviceRequest.getDefaultInstance());
-    assertEquals(authenticatedDevice.getDeviceId(), deviceId);
+    assertEquals(deviceId, authenticatedDevice.getDeviceId());
     assertEquals(UUIDUtil.fromByteString(authenticatedDevice.getAccountIdentifier()), aci);
   }
 
@@ -86,7 +85,7 @@ class RequireAuthenticationInterceptorTest {
 
     final StatusRuntimeException e = assertThrows(StatusRuntimeException.class,
         () -> client.getRequestAttributes(GetRequestAttributesRequest.getDefaultInstance()));
-    Assert.assertEquals(e.getStatus().getCode(), Status.Code.UNAUTHENTICATED);
+    assertEquals(Status.Code.UNAUTHENTICATED, e.getStatus().getCode());
   }
 
   @Test
@@ -97,6 +96,6 @@ class RequireAuthenticationInterceptorTest {
 
     final StatusRuntimeException e = assertThrows(StatusRuntimeException.class,
         () -> client.getRequestAttributes(GetRequestAttributesRequest.getDefaultInstance()));
-    Assert.assertEquals(e.getStatus().getCode(), Status.Code.UNAUTHENTICATED);
+    assertEquals(Status.Code.UNAUTHENTICATED, e.getStatus().getCode());
   }
 }
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/grpc/RequestAttributesInterceptorTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/grpc/RequestAttributesInterceptorTest.java
index e30dd9549..53b90e94f 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/grpc/RequestAttributesInterceptorTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/grpc/RequestAttributesInterceptorTest.java
@@ -4,9 +4,6 @@
  */
 package org.whispersystems.textsecuregcm.grpc;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import io.grpc.ManagedChannel;
 import io.grpc.Metadata;
 import io.grpc.Server;
@@ -30,9 +27,12 @@ import org.signal.chat.rpc.GetRequestAttributesRequest;
 import org.signal.chat.rpc.GetRequestAttributesResponse;
 import org.signal.chat.rpc.RequestAttributesGrpc;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class RequestAttributesInterceptorTest {
 
-  private static String USER_AGENT = "Signal-Android/4.53.7 (Android 8.1; libsignal)";
+  private static final String USER_AGENT = "Signal-Android/4.53.7 (Android 8.1; libsignal)";
   private Server server;
   private AtomicBoolean removeUserAgent;
 
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/KEMPreKeyPageTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/KEMPreKeyPageTest.java
index 9d28c22f1..c858f5cad 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/KEMPreKeyPageTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/KEMPreKeyPageTest.java
@@ -4,9 +4,6 @@
  */
 package org.whispersystems.textsecuregcm.storage;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
-
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.Collections;
@@ -17,6 +14,9 @@ import org.signal.libsignal.protocol.ecc.ECKeyPair;
 import org.whispersystems.textsecuregcm.entities.KEMSignedPreKey;
 import org.whispersystems.textsecuregcm.tests.util.KeysHelper;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 class KEMPreKeyPageTest {
 
   private static final ECKeyPair IDENTITY_KEY_PAIR = ECKeyPair.generate();
@@ -27,7 +27,7 @@ class KEMPreKeyPageTest {
     final int actualMagic = page.getInt();
     assertEquals(KEMPreKeyPage.HEADER_MAGIC, actualMagic);
     final int version = page.getInt();
-    assertEquals(version, 1);
+    assertEquals(1, version);
     assertEquals(KEMPreKeyPage.SERIALIZED_PREKEY_LENGTH, page.remaining());
   }
 
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/workers/RemoveOrphanedPreKeyPagesCommandTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/workers/RemoveOrphanedPreKeyPagesCommandTest.java
index 7d16ac7af..a12607bf4 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/workers/RemoveOrphanedPreKeyPagesCommandTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/workers/RemoveOrphanedPreKeyPagesCommandTest.java
@@ -26,7 +26,7 @@ import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import net.sourceforge.argparse4j.inf.Namespace;
 import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.junitpioneer.jupiter.cartesian.CartesianTest;