diff --git a/tests/conftest.py b/tests/conftest.py
index f769e90a0..900dc6fb8 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -467,15 +467,12 @@ def test_sheriff(request, transactional_db):
 
 
 @pytest.fixture
-def client_credentials(request, test_user):
-    from django.conf import settings
+def client_credentials(request, transactional_db):
     from treeherder.credentials.models import Credentials
 
-    # We need to get_or_create here because of bug 1133273.
-    # It can be a straight create once that bug is solved.
-    client_credentials, _ = Credentials.objects.get_or_create(
-        client_id=settings.ETL_CLIENT_ID,
-        defaults={'owner': test_user, 'authorized': True}
+    client_credentials = Credentials.objects.create(
+        client_id='test_client',
+        authorized=True
     )
 
     def fin():
diff --git a/treeherder/config/settings.py b/treeherder/config/settings.py
index 0e9d2274d..4d6cb8f7c 100644
--- a/treeherder/config/settings.py
+++ b/treeherder/config/settings.py
@@ -546,9 +546,6 @@ SWAGGER_SETTINGS = {"enabled_methods": ['get', ]}
 
 HAWK_CREDENTIALS_LOOKUP = 'treeherder.webapp.api.auth.hawk_lookup'
 
-# This is the client ID used by the internal data ingestion service.
-ETL_CLIENT_ID = 'treeherder-etl'
-
 # Configuration for elasticsearch backend
 ELASTIC_SEARCH = {
     "url": env.str('ELASTICSEARCH_URL', default=""),