diff --git a/register-acceptance-test/src/test/java/org/opengroup/osdu/register/subscriber/GetSubscriberByIdApiTest.java b/register-acceptance-test/src/test/java/org/opengroup/osdu/register/subscriber/GetSubscriberByIdApiTest.java
index cb273c982050f2d4778df3adf6f91fff1f3a103c..09f33fc9449002e03a84b96f1365198d4e0c26e6 100644
--- a/register-acceptance-test/src/test/java/org/opengroup/osdu/register/subscriber/GetSubscriberByIdApiTest.java
+++ b/register-acceptance-test/src/test/java/org/opengroup/osdu/register/subscriber/GetSubscriberByIdApiTest.java
@@ -63,7 +63,6 @@ public final class GetSubscriberByIdApiTest extends RetrieveApiTestTemplate {
         String body = response.getEntity(String.class);
         Subscriber subscriber = new Gson().fromJson(body, Subscriber.class);
         assertEquals("My test listener.", subscriber.description);
-        assertTrue(subscriber.createdBy, subscriber.createdBy.endsWith("gserviceaccount.com"));
         assertEquals("My listener", subscriber.name);
         assertEquals("records-changed", subscriber.topic);
     }
diff --git a/register-acceptance-test/src/test/java/org/opengroup/osdu/register/util/TestHttpClient.java b/register-acceptance-test/src/test/java/org/opengroup/osdu/register/util/TestHttpClient.java
index 963fd3176e563a678db2f3f85c97ff333cb14f99..323edcf669f5863bd48bc68365eddfadcfb3d348 100644
--- a/register-acceptance-test/src/test/java/org/opengroup/osdu/register/util/TestHttpClient.java
+++ b/register-acceptance-test/src/test/java/org/opengroup/osdu/register/util/TestHttpClient.java
@@ -43,7 +43,7 @@ public class TestHttpClient extends TestUtils {
 
   @Override
   public String getOpsAccessToken() {
-    if (StringUtils.isNotEmpty(opsToken)) {
+    if (StringUtils.isEmpty(opsToken)) {
         opsToken = tokenProvider.getOpsAccessToken();
     }
     return "Bearer " + opsToken;
@@ -51,7 +51,7 @@ public class TestHttpClient extends TestUtils {
 
   @Override
   public String getAdmAccessToken() {
-    if (StringUtils.isNotEmpty(admToken)) {
+    if (StringUtils.isEmpty(admToken)) {
         admToken = tokenProvider.getAdminAccessToken();
     }
     return "Bearer " + admToken;
@@ -59,7 +59,7 @@ public class TestHttpClient extends TestUtils {
 
   @Override
   public String getEditorAccessToken() {
-    if (StringUtils.isNotEmpty(editorToken)) {
+    if (StringUtils.isEmpty(editorToken)) {
       editorToken = tokenProvider.getEditorAccessToken();
     }
     return "Bearer " + editorToken;
@@ -67,7 +67,7 @@ public class TestHttpClient extends TestUtils {
 
   @Override
   public String getNoDataAccessToken() {
-    if (StringUtils.isNotEmpty(noAccessToken)) {
+    if (StringUtils.isEmpty(noAccessToken)) {
         noAccessToken = tokenProvider.getNoAccessToken();
     }
     return "Bearer " + noAccessToken;