diff --git a/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_0.java b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_0.java
index 82687aff2..68b3156cb 100644
--- a/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_0.java
+++ b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_0.java
@@ -929,9 +929,7 @@ public class TestMITREidDataService_1_0 {
 		List<OAuth2RefreshTokenEntity> savedRefreshTokens = new ArrayList(fakeRefreshTokenTable.values()); //capturedRefreshTokens.getAllValues();
         Collections.sort(savedRefreshTokens, new refreshTokenIdComparator());
         
-        assertThat(savedRefreshTokens.get(0).getAuthenticationHolder().getAuthentication().getOAuth2Request().getClientId(), 
-                equalTo(token1.getAuthenticationHolder().getAuthentication().getOAuth2Request().getClientId()));
-        assertThat(savedRefreshTokens.get(1).getAuthenticationHolder().getAuthentication().getOAuth2Request().getClientId(), 
-                equalTo(token2.getAuthenticationHolder().getAuthentication().getOAuth2Request().getClientId()));
+        assertThat(savedRefreshTokens.get(0).getAuthenticationHolder().getId(), equalTo(356L));
+        assertThat(savedRefreshTokens.get(1).getAuthenticationHolder().getId(), equalTo(357L));
     }
 }
\ No newline at end of file
diff --git a/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_1.java b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_1.java
index e69891ee7..0e5d07869 100644
--- a/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_1.java
+++ b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_1.java
@@ -1823,10 +1823,8 @@ public class TestMITREidDataService_1_1 {
 		List<OAuth2RefreshTokenEntity> savedRefreshTokens = new ArrayList(fakeRefreshTokenTable.values()); //capturedRefreshTokens.getAllValues();
         Collections.sort(savedRefreshTokens, new refreshTokenIdComparator());
         
-        assertThat(savedRefreshTokens.get(0).getAuthenticationHolder().getAuthentication().getOAuth2Request().getClientId(), 
-                equalTo(token1.getAuthenticationHolder().getAuthentication().getOAuth2Request().getClientId()));
-        assertThat(savedRefreshTokens.get(1).getAuthenticationHolder().getAuthentication().getOAuth2Request().getClientId(), 
-                equalTo(token2.getAuthenticationHolder().getAuthentication().getOAuth2Request().getClientId()));
+        assertThat(savedRefreshTokens.get(0).getAuthenticationHolder().getId(), equalTo(356L));
+        assertThat(savedRefreshTokens.get(1).getAuthenticationHolder().getId(), equalTo(357L));
     }
     
 	private Set<String> jsonArrayToStringSet(JsonArray a) {