AndroidDevsOrg
diff --git a/‎src/test/java/org/kohsuke/github/GHOrganizationTest.java
Copy file name to clipboardExpand all lines: src/test/java/org/kohsuke/github/GHOrganizationTest.java
+15-8Lines changed: 15 additions & 8 deletions b/‎src/test/java/org/kohsuke/github/GHOrganizationTest.java
Copy file name to clipboardExpand all lines: src/test/java/org/kohsuke/github/GHOrganizationTest.java
+15-8Lines changed: 15 additions & 8 deletions
@@ -58,22 +58,29 @@ public void testInviteUser() throws IOException {
         // assertTrue(org.hasMember(user));
     }
 
+    @Before
+    public void cleanUpTeam() throws IOException {
+        // Cleanup is only needed when proxying
+        if (!mockGitHub.isUseProxy()) {
+            return;
+        }
+
+        GHTeam team = gitHubBeforeAfter.getOrganization(GITHUB_API_TEST_ORG).
+                getTeamByName("create-team-test");
+        if (team != null) {
+            team.delete();
+        }
+    }
+
     @Test
     public void testCreateTeamWithRepoAccess() throws IOException {
         String REPO_NAME = "github-api";
-        String TEAM_NAME = "create-team-test";
 
         GHOrganization org = gitHub.getOrganization(GITHUB_API_TEST_ORG);
         GHRepository repo = org.getRepository(REPO_NAME);
 
-        // Clean up team if exists.
-        GHTeam existingTeam = org.getTeamByName(TEAM_NAME);
-        if (existingTeam != null) {
-            existingTeam.delete();
-        }
-
         // Create team with access to repository. Check access was granted.
-        GHTeam team = org.createTeam(TEAM_NAME, GHOrganization.Permission.PUSH, repo);
+        GHTeam team = org.createTeam("create-team-test", GHOrganization.Permission.PUSH, repo);
         Assert.assertTrue(team.getRepositories().containsKey(REPO_NAME));
     }
 }