diff --git a/tests/conftest.py b/tests/conftest.py
index f7ca7761..46fd6949 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -49,7 +49,7 @@ ENTITLEMENTS = {
     "windows",
     "windows_phone",
 }
-SYNC_DEVICE_IDENTIFIER = "sync-client-%s" % plexapi.X_PLEX_IDENTIFIER
+SYNC_DEVICE_IDENTIFIER = "test-sync-client-%s" % plexapi.X_PLEX_IDENTIFIER
 SYNC_DEVICE_HEADERS = {
     "X-Plex-Provides": "sync-target",
     "X-Plex-Platform": "iOS",
diff --git a/tools/plex-teardowntest.py b/tools/plex-teardowntest.py
index a47b1537..f852ec85 100755
--- a/tools/plex-teardowntest.py
+++ b/tools/plex-teardowntest.py
@@ -19,7 +19,7 @@ if __name__ == '__main__':
             device.delete()
 
     # Remove the test sync client
-    sync_client_identifier = 'sync-client-%s' % X_PLEX_IDENTIFIER
+    sync_client_identifier = 'test-sync-client-%s' % X_PLEX_IDENTIFIER
     for device in plex.myPlexAccount().devices():
         if device.clientIdentifier == sync_client_identifier:
             print('Removing device "%s", with id "%s"' % (device.name, device. clientIdentifier))