diff --git a/gerrit-reviewdb/BUCK b/gerrit-reviewdb/BUCK
index a5fb1f5047..532ce8019e 100644
--- a/gerrit-reviewdb/BUCK
+++ b/gerrit-reviewdb/BUCK
@@ -30,6 +30,7 @@ java_test(
   srcs = glob([TESTS + 'client/**/*.java']),
   deps = [
     ':client',
+    '//gerrit-server:testutil',
     '//lib:gwtorm',
     '//lib:truth',
   ],
diff --git a/gerrit-reviewdb/BUILD b/gerrit-reviewdb/BUILD
index f18f356e9f..f9a7235022 100644
--- a/gerrit-reviewdb/BUILD
+++ b/gerrit-reviewdb/BUILD
@@ -37,6 +37,7 @@ junit_tests(
   srcs = glob([TESTS + 'client/**/*.java']),
   deps = [
     ':client',
+    '//gerrit-server:testutil',
     '//lib:gwtorm',
     '//lib:truth',
   ],
diff --git a/gerrit-reviewdb/src/test/java/com/google/gerrit/reviewdb/client/PatchSetApprovalTest.java b/gerrit-reviewdb/src/test/java/com/google/gerrit/reviewdb/client/PatchSetApprovalTest.java
index eba08c80bd..008c77fa2f 100644
--- a/gerrit-reviewdb/src/test/java/com/google/gerrit/reviewdb/client/PatchSetApprovalTest.java
+++ b/gerrit-reviewdb/src/test/java/com/google/gerrit/reviewdb/client/PatchSetApprovalTest.java
@@ -16,19 +16,14 @@ package com.google.gerrit.reviewdb.client;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.gwtorm.client.KeyUtil;
-import com.google.gwtorm.server.StandardKeyEncoder;
+import com.google.gerrit.testutil.GerritBaseTests;
 
 import org.junit.Test;
 
 import java.util.HashMap;
 import java.util.Map;
 
-public class PatchSetApprovalTest {
-  static {
-    KeyUtil.setEncoderImpl(new StandardKeyEncoder());
-  }
-
+public class PatchSetApprovalTest extends GerritBaseTests {
   @Test
   public void keyEquality() {
     PatchSetApproval.Key k1 = new PatchSetApproval.Key(