diff --git a/src/test/java/com/googlesource/gerrit/plugins/renameproject/conditions/RenamePreconditionsTest.java b/src/test/java/com/googlesource/gerrit/plugins/renameproject/conditions/RenamePreconditionsTest.java
index 05194d7..43050e1 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/renameproject/conditions/RenamePreconditionsTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/renameproject/conditions/RenamePreconditionsTest.java
@@ -29,10 +29,8 @@
 import com.google.gerrit.server.project.ProjectResource;
 import com.google.inject.Provider;
 import com.googlesource.gerrit.plugins.renameproject.CannotRenameProjectException;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import org.eclipse.jgit.errors.RepositoryNotFoundException;
 import org.eclipse.jgit.lib.ObjectDatabase;
 import org.eclipse.jgit.lib.Repository;
 import org.junit.Before;
@@ -61,7 +59,7 @@
   private Project.NameKey newProjectKey = new Project.NameKey("newProject");
 
   @Before
-  public void setUp() throws RepositoryNotFoundException, IOException {
+  public void setUp() throws Exception {
     oldRsrc = new ProjectResource(control);
     when(repoManager.openRepository(newProjectKey)).thenReturn(repo);
     when(repo.getObjectDatabase()).thenReturn(objDb);
@@ -76,8 +74,7 @@
   }
 
   @Test(expected = CannotRenameProjectException.class)
-  public void testAssertCannotRenameRepoExists()
-      throws RepositoryNotFoundException, IOException, CannotRenameProjectException {
+  public void testAssertCannotRenameRepoExists() throws Exception {
     Project oldProject = new Project(new Project.NameKey("oldProject"));
     when(control.getProject()).thenReturn(oldProject);
     when(objDb.exists()).thenReturn(true);
@@ -86,8 +83,7 @@
   }
 
   @Test(expected = CannotRenameProjectException.class)
-  public void testAssertCannotRenameAllProjects()
-      throws RepositoryNotFoundException, IOException, CannotRenameProjectException {
+  public void testAssertCannotRenameAllProjects() throws Exception {
     Project oldProject = new Project(allProjects);
     when(control.getProject()).thenReturn(oldProject);
     when(objDb.exists()).thenReturn(false);
@@ -96,8 +92,7 @@
   }
 
   @Test(expected = CannotRenameProjectException.class)
-  public void testAssertCannotRenameAllUsers()
-      throws RepositoryNotFoundException, IOException, CannotRenameProjectException {
+  public void testAssertCannotRenameAllUsers() throws Exception {
     Project oldProject = new Project(allUsersName);
     when(control.getProject()).thenReturn(oldProject);
     when(objDb.exists()).thenReturn(false);
@@ -106,8 +101,7 @@
   }
 
   @Test(expected = CannotRenameProjectException.class)
-  public void testAssertCannotRenameHasChildren()
-      throws RepositoryNotFoundException, IOException, CannotRenameProjectException {
+  public void testAssertCannotRenameHasChildren() throws Exception {
     Project oldProject = new Project(new Project.NameKey("oldProject"));
     when(control.getProject()).thenReturn(oldProject);
     when(objDb.exists()).thenReturn(false);
