diff --git a/src/test/java/org/zendesk/client/v2/RealSmokeTest.java b/src/test/java/org/zendesk/client/v2/RealSmokeTest.java
index 39744ece..459270f6 100644
--- a/src/test/java/org/zendesk/client/v2/RealSmokeTest.java
+++ b/src/test/java/org/zendesk/client/v2/RealSmokeTest.java
@@ -1795,15 +1795,23 @@ public void createOrganizationMemberships() throws Exception {
 
   @Test
   public void lookupOrganizationByExternalId() throws Exception {
+    String orgId = "i";
     createClientWithTokenOrPassword();
 
     Organization newOrganization = newTestOrganization();
-    newOrganization.setExternalId("i");
-    Organization resultOrganization = instance.createOrganization(newOrganization);
-    assertNotNull(resultOrganization);
+    newOrganization.setExternalId(orgId);
+    Organization resultOrganization = null;
+    try {
+      resultOrganization = instance.createOrganization(newOrganization);
+      assertNotNull(resultOrganization);
 
-    Iterable<Organization> or = instance.lookupOrganizationsByExternalId("i");
-    assertEquals(1, StreamSupport.stream(or.spliterator(), false).count());
+      Iterable<Organization> or = instance.lookupOrganizationsByExternalId(orgId);
+      assertEquals(1, StreamSupport.stream(or.spliterator(), false).count());
+    } finally {
+      if (resultOrganization != null) {
+        instance.deleteOrganization(resultOrganization);
+      }
+    }
 
     assertThrows(
         IllegalArgumentException.class, () -> instance.lookupOrganizationsByExternalId(""));