diff --git a/internal/apptoken/repository_test.go b/internal/apptoken/repository_test.go
index b5db1f7563..d9f1d25dbb 100644
--- a/internal/apptoken/repository_test.go
+++ b/internal/apptoken/repository_test.go
@@ -856,10 +856,11 @@ func TestRepository_CreateAppToken(t *testing.T) {
 				return
 			}
 			assert.NoError(err)
-			assert.NotNil(at.PublicId)
+			assert.NotNil(at)
+			assert.NotEmpty(at.PublicId)
+			assert.NotEmpty(at.Token)
 			assert.NotNil(at.CreateTime)
 			assert.NotNil(at.ApproximateLastAccessTime)
-			assert.NotNil(at.Token)
 			assert.Equal(at.CreateTime, at.ApproximateLastAccessTime)
 			assert.GreaterOrEqual(at.ExpirationTime.AsTime().Unix(), at.CreateTime.AsTime().Unix())