diff --git a/java/com/google/gerrit/common/Common.gwt.xml b/java/com/google/gerrit/common/Common.gwt.xml
index fede66517b..56bbb84d23 100644
--- a/java/com/google/gerrit/common/Common.gwt.xml
+++ b/java/com/google/gerrit/common/Common.gwt.xml
@@ -18,6 +18,7 @@
   <inherits name='com.google.gwtjsonrpc.GWTJSONRPC'/>
   <inherits name="com.google.gwt.logging.Logging"/>
   <source path="">
+    <exclude name='**/testing/**/*.java'/>
     <include name='**/*.java'/>
   </source>
 </module>
diff --git a/java/com/google/gerrit/common/data/testing/GroupReferenceSubject.java b/java/com/google/gerrit/common/data/testing/GroupReferenceSubject.java
index b689254b9e..1988d66603 100644
--- a/java/com/google/gerrit/common/data/testing/GroupReferenceSubject.java
+++ b/java/com/google/gerrit/common/data/testing/GroupReferenceSubject.java
@@ -16,7 +16,6 @@ package com.google.gerrit.common.data.testing;
 
 import static com.google.common.truth.Truth.assertAbout;
 
-import com.google.common.annotations.GwtIncompatible;
 import com.google.common.truth.ComparableSubject;
 import com.google.common.truth.FailureMetadata;
 import com.google.common.truth.StringSubject;
@@ -25,7 +24,6 @@ import com.google.common.truth.Truth;
 import com.google.gerrit.common.data.GroupReference;
 import com.google.gerrit.reviewdb.client.AccountGroup;
 
-@GwtIncompatible("Unemulated com.google.gerrit.common.data.testing.GroupReferenceSubject")
 public class GroupReferenceSubject extends Subject<GroupReferenceSubject, GroupReference> {
 
   public static GroupReferenceSubject assertThat(GroupReference group) {