diff --git a/src/main/java/io/spring/issuebot/IssueBotApplication.java b/src/main/java/io/spring/issuebot/IssueBotApplication.java
index 1320697..d28f46a 100644
--- a/src/main/java/io/spring/issuebot/IssueBotApplication.java
+++ b/src/main/java/io/spring/issuebot/IssueBotApplication.java
@@ -18,7 +18,6 @@
 
 import java.util.List;
 
-import io.spring.issuebot.github.GitHubOperations;
 import io.spring.issuebot.github.GitHubTemplate;
 import io.spring.issuebot.github.RegexLinkParser;
 
@@ -49,11 +48,10 @@ GitHubTemplate gitHubTemplate(GitHubProperties gitHubProperties) {
 	}
 
 	@Bean
-	RepositoryMonitor repositoryMonitor(GitHubOperations gitHub,
-			MonitoringProperties monitoringProperties,
-			List<IssueListener> issueListeners) {
-		return new RepositoryMonitor(gitHub, monitoringProperties.getRepositories(),
-				issueListeners);
+	RepositoryMonitor repositoryMonitor(MonitoringProperties monitoringProperties,
+			List<RepositoryListener> repositoryListeners) {
+		return new RepositoryMonitor(monitoringProperties.getRepositories(),
+				repositoryListeners);
 	}
 
 }
diff --git a/src/main/java/io/spring/issuebot/IssueMonitor.java b/src/main/java/io/spring/issuebot/IssueMonitor.java
new file mode 100644
index 0000000..315f1cc
--- /dev/null
+++ b/src/main/java/io/spring/issuebot/IssueMonitor.java
@@ -0,0 +1,45 @@
+package io.spring.issuebot;
+
+import io.spring.issuebot.github.Issue;
+import io.spring.issuebot.github.Page;
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+@Service
+public class IssueMonitor {
+
+	private static final Logger log = LoggerFactory.getLogger(IssueMonitor.class);
+
+	private final List<IssueListener> issueListeners;
+
+	public IssueMonitor(List<IssueListener> issueListeners) {
+		this.issueListeners = issueListeners;
+	}
+
+	public void monitorIssue(Page<Issue> page, IssueOperation issueOperation) {
+		while (page != null) {
+			for (Issue issue : page.getContent()) {
+				for (IssueListener issueListener : this.issueListeners) {
+					try {
+						issueOperation.run(issue, issueListener);
+					}
+					catch (Exception ex) {
+						log.warn("Listener '{}' failed when handling issue '{}'",
+								issueListener, issue, ex);
+					}
+				}
+			}
+			page = page.next();
+		}
+	}
+
+	@FunctionalInterface
+	public interface IssueOperation {
+
+		void run(Issue issue, IssueListener issueListener);
+
+	}
+
+}
diff --git a/src/main/java/io/spring/issuebot/RepositoryListener.java b/src/main/java/io/spring/issuebot/RepositoryListener.java
new file mode 100644
index 0000000..7ab043b
--- /dev/null
+++ b/src/main/java/io/spring/issuebot/RepositoryListener.java
@@ -0,0 +1,14 @@
+package io.spring.issuebot;
+
+/**
+ * A {@code RepositoryListener} is called when monitoring a repository
+ */
+public interface RepositoryListener {
+
+	/**
+	 * Handle the specific repository
+	 * @param repository the repository
+	 */
+	void handle(Repository repository);
+
+}
diff --git a/src/main/java/io/spring/issuebot/RepositoryMonitor.java b/src/main/java/io/spring/issuebot/RepositoryMonitor.java
index 290c6e4..117675a 100644
--- a/src/main/java/io/spring/issuebot/RepositoryMonitor.java
+++ b/src/main/java/io/spring/issuebot/RepositoryMonitor.java
@@ -17,13 +17,8 @@
 package io.spring.issuebot;
 
 import java.util.List;
-
-import io.spring.issuebot.github.GitHubOperations;
-import io.spring.issuebot.github.Issue;
-import io.spring.issuebot.github.Page;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.springframework.scheduling.annotation.Scheduled;
 
 /**
@@ -35,52 +30,27 @@ class RepositoryMonitor {
 
 	private static final Logger log = LoggerFactory.getLogger(RepositoryMonitor.class);
 
-	private final GitHubOperations gitHub;
-
 	private final List<Repository> repositories;
 
-	private final List<IssueListener> issueListeners;
+	private final List<RepositoryListener> repositoryListeners;
 
-	RepositoryMonitor(GitHubOperations gitHub, List<Repository> repositories,
-			List<IssueListener> issueListeners) {
-		this.gitHub = gitHub;
+	RepositoryMonitor(List<Repository> repositories,
+			List<RepositoryListener> repositoryListeners) {
 		this.repositories = repositories;
-		this.issueListeners = issueListeners;
+		this.repositoryListeners = repositoryListeners;
 	}
 
 	@Scheduled(fixedRate = 5 * 60 * 1000)
 	void monitor() {
 		for (Repository repository : this.repositories) {
-			monitor(repository);
-		}
-	}
-
-	private void monitor(Repository repository) {
-		log.info("Monitoring {}/{}", repository.getOrganization(), repository.getName());
-		try {
-			Page<Issue> page = this.gitHub.getIssues(repository.getOrganization(),
+			log.info("Monitoring {}/{}", repository.getOrganization(),
 					repository.getName());
-			while (page != null) {
-				for (Issue issue : page.getContent()) {
-					for (IssueListener issueListener : this.issueListeners) {
-						try {
-							issueListener.onOpenIssue(repository, issue);
-						}
-						catch (Exception ex) {
-							log.warn("Listener '{}' failed when handling issue '{}'",
-									issueListener, issue, ex);
-						}
-					}
-				}
-				page = page.next();
+			for (RepositoryListener repositoryListener : repositoryListeners) {
+				repositoryListener.handle(repository);
 			}
+			log.info("Monitoring of {}/{} completed", repository.getOrganization(),
+					repository.getName());
 		}
-		catch (Exception ex) {
-			log.warn("A failure occurred during monitoring of {}/{}",
-					repository.getOrganization(), repository.getName(), ex);
-		}
-		log.info("Monitoring of {}/{} completed", repository.getOrganization(),
-				repository.getName());
 	}
 
 }
diff --git a/src/main/java/io/spring/issuebot/github/ClosedIssuesListener.java b/src/main/java/io/spring/issuebot/github/ClosedIssuesListener.java
new file mode 100644
index 0000000..1c739cf
--- /dev/null
+++ b/src/main/java/io/spring/issuebot/github/ClosedIssuesListener.java
@@ -0,0 +1,39 @@
+package io.spring.issuebot.github;
+
+import io.spring.issuebot.IssueMonitor;
+import io.spring.issuebot.Repository;
+import io.spring.issuebot.RepositoryListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ClosedIssuesListener implements RepositoryListener {
+
+	private static final Logger log = LoggerFactory.getLogger(ClosedIssuesListener.class);
+
+	private final GitHubOperations gitHub;
+
+	private final IssueMonitor issueMonitor;
+
+	public ClosedIssuesListener(GitHubOperations gitHub, IssueMonitor issueMonitor) {
+		this.issueMonitor = issueMonitor;
+		this.gitHub = gitHub;
+	}
+
+	@Override
+	public void handle(Repository repository) {
+		try {
+			Page<Issue> page = this.gitHub.getClosedIssuesWithLabel(
+					repository.getOrganization(), repository.getName(),
+					"status: waiting-for-triage");
+			issueMonitor.monitorIssue(page, (issue, issueListener) -> issueListener
+					.onIssueClosure(repository, issue));
+		}
+		catch (Exception ex) {
+			log.warn("A failure occurred during monitoring of {}/{}",
+					repository.getOrganization(), repository.getName(), ex);
+		}
+	}
+
+}
diff --git a/src/main/java/io/spring/issuebot/github/GitHubOperations.java b/src/main/java/io/spring/issuebot/github/GitHubOperations.java
index b7e19d7..f38ae8d 100644
--- a/src/main/java/io/spring/issuebot/github/GitHubOperations.java
+++ b/src/main/java/io/spring/issuebot/github/GitHubOperations.java
@@ -32,6 +32,17 @@ public interface GitHubOperations {
 	 */
 	Page<Issue> getIssues(String organization, String repository);
 
+	/**
+	 * Returns the open closed issues in the {@code repository} owned by the given
+	 * {@code organization} with the given label.
+	 * @param organization the name of the organization
+	 * @param repository the name of the repository
+	 * @param label the label the issues need to have
+	 * @return the issues
+	 */
+	Page<Issue> getClosedIssuesWithLabel(String organization, String repository,
+			String label);
+
 	/**
 	 * Returns the comments that have been made on the given {@code issue}.
 	 * @param issue the issue
diff --git a/src/main/java/io/spring/issuebot/github/GitHubTemplate.java b/src/main/java/io/spring/issuebot/github/GitHubTemplate.java
index acd5e19..0ec8cee 100644
--- a/src/main/java/io/spring/issuebot/github/GitHubTemplate.java
+++ b/src/main/java/io/spring/issuebot/github/GitHubTemplate.java
@@ -113,6 +113,14 @@ public Page<Issue> getIssues(String organization, String repository) {
 		return getPage(url, Issue[].class);
 	}
 
+	@Override
+	public Page<Issue> getClosedIssuesWithLabel(String organization, String repository,
+			String label) {
+		String url = "https://api.github.com/repos/" + organization + "/" + repository
+				+ "/issues?state=closed&labels=" + label;
+		return getPage(url, Issue[].class);
+	}
+
 	@Override
 	public Page<Comment> getComments(Issue issue) {
 		return getPage(issue.getCommentsUrl(), Comment[].class);
@@ -149,7 +157,7 @@ public Issue addLabel(Issue issue, String labelName) {
 		}
 		return new Issue(issue.getUrl(), issue.getCommentsUrl(), issue.getEventsUrl(),
 				issue.getLabelsUrl(), issue.getUser(), Arrays.asList(response.getBody()),
-				issue.getMilestone(), issue.getPullRequest());
+				issue.getMilestone(), issue.getPullRequest(), issue.getState());
 	}
 
 	@Override
@@ -161,17 +169,17 @@ public Issue removeLabel(Issue issue, String labelName) {
 		catch (URISyntaxException ex) {
 			throw new RuntimeException(ex);
 		}
-		ResponseEntity<Label[]> response = this.rest.exchange(
-				new RequestEntity<Void>(HttpMethod.DELETE, URI.create(
-						issue.getLabelsUrl().replace("{/name}", "/" + encodedName))),
-				Label[].class);
+		URI uri = URI.create(issue.getLabelsUrl().replace("{/name}", "/" + encodedName));
+		log.info("Removing label {} on {}", labelName, uri);
+		ResponseEntity<Label[]> response = this.rest
+				.exchange(new RequestEntity<Void>(HttpMethod.DELETE, uri), Label[].class);
 		if (response.getStatusCode() != HttpStatus.OK) {
 			log.warn("Failed to remove label from issue. Response status: "
 					+ response.getStatusCode());
 		}
 		return new Issue(issue.getUrl(), issue.getCommentsUrl(), issue.getEventsUrl(),
 				issue.getLabelsUrl(), issue.getUser(), Arrays.asList(response.getBody()),
-				issue.getMilestone(), issue.getPullRequest());
+				issue.getMilestone(), issue.getPullRequest(), issue.getState());
 	}
 
 	@Override
diff --git a/src/main/java/io/spring/issuebot/github/Issue.java b/src/main/java/io/spring/issuebot/github/Issue.java
index f81d11a..58b4256 100644
--- a/src/main/java/io/spring/issuebot/github/Issue.java
+++ b/src/main/java/io/spring/issuebot/github/Issue.java
@@ -44,6 +44,8 @@ public class Issue {
 
 	private final PullRequest pullRequest;
 
+	private final String state;
+
 	/**
 	 * Creates a new {@code Issue}.
 	 * @param url the url of the issue in the GitHub API
@@ -54,6 +56,7 @@ public class Issue {
 	 * @param labels the labels applied to the issue
 	 * @param milestone the milestone applied to the issue
 	 * @param pullRequest details of the pull request (if this issue is a pull request)
+	 * @param state the state of the issue, open or closed
 	 */
 	@JsonCreator
 	public Issue(@JsonProperty("url") String url,
@@ -62,7 +65,8 @@ public Issue(@JsonProperty("url") String url,
 			@JsonProperty("labels_url") String labelsUrl, @JsonProperty("user") User user,
 			@JsonProperty("labels") List<Label> labels,
 			@JsonProperty("milestone") Milestone milestone,
-			@JsonProperty("pull_request") PullRequest pullRequest) {
+			@JsonProperty("pull_request") PullRequest pullRequest,
+			@JsonProperty("state") String state) {
 		this.url = url;
 		this.commentsUrl = commentsUrl;
 		this.eventsUrl = eventsUrl;
@@ -71,6 +75,7 @@ public Issue(@JsonProperty("url") String url,
 		this.labels = labels;
 		this.milestone = milestone;
 		this.pullRequest = pullRequest;
+		this.state = state;
 	}
 
 	String getUrl() {
@@ -105,6 +110,18 @@ public PullRequest getPullRequest() {
 		return this.pullRequest;
 	}
 
+	public String getState() {
+		return this.state;
+	}
+
+	public boolean isOpen() {
+		return this.getState().equals("open");
+	}
+
+	public boolean isClosed() {
+		return this.getState().equals("closed");
+	}
+
 	@Override
 	public String toString() {
 		return this.url;
diff --git a/src/main/java/io/spring/issuebot/github/OpenIssuesListener.java b/src/main/java/io/spring/issuebot/github/OpenIssuesListener.java
new file mode 100644
index 0000000..4d3bae7
--- /dev/null
+++ b/src/main/java/io/spring/issuebot/github/OpenIssuesListener.java
@@ -0,0 +1,38 @@
+package io.spring.issuebot.github;
+
+import io.spring.issuebot.IssueMonitor;
+import io.spring.issuebot.Repository;
+import io.spring.issuebot.RepositoryListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+@Service
+public class OpenIssuesListener implements RepositoryListener {
+
+	private static final Logger log = LoggerFactory.getLogger(OpenIssuesListener.class);
+
+	private final GitHubOperations gitHub;
+
+	private final IssueMonitor issueMonitor;
+
+	public OpenIssuesListener(GitHubOperations gitHub, IssueMonitor issueMonitor) {
+		this.issueMonitor = issueMonitor;
+		this.gitHub = gitHub;
+	}
+
+	@Override
+	public void handle(Repository repository) {
+		try {
+			Page<Issue> page = this.gitHub.getIssues(repository.getOrganization(),
+					repository.getName());
+			issueMonitor.monitorIssue(page, (issue, issueListener) -> issueListener
+					.onOpenIssue(repository, issue));
+		}
+		catch (Exception ex) {
+			log.warn("A failure occurred during monitoring of {}/{}",
+					repository.getOrganization(), repository.getName(), ex);
+		}
+	}
+
+}
diff --git a/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java b/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java
index 7a2b499..248f812 100644
--- a/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java
+++ b/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java
@@ -16,20 +16,15 @@
 
 package io.spring.issuebot;
 
-import java.util.Arrays;
-
-import io.spring.issuebot.github.GitHubOperations;
-import io.spring.issuebot.github.Issue;
-import io.spring.issuebot.github.Page;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.mockito.BDDMockito.given;
-import static org.mockito.BDDMockito.willThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
+import java.util.Arrays;
+import java.util.Collections;
+import org.junit.Before;
+import org.junit.Test;
+
 /**
  * Tests for {@link RepositoryMonitor}.
  *
@@ -37,19 +32,19 @@
  */
 public class RepositoryMonitorTests {
 
-	private final GitHubOperations gitHub = mock(GitHubOperations.class);
-
-	private final IssueListener issueListenerOne = mock(IssueListener.class);
+	private final RepositoryListener repositoryListenerOne = mock(
+			RepositoryListener.class);
 
-	private final IssueListener issueListenerTwo = mock(IssueListener.class);
+	private final RepositoryListener repositoryListenerTwo = mock(
+			RepositoryListener.class);
 
 	private final Repository repositoryOne = new Repository();
 
 	private final Repository repositoryTwo = new Repository();
 
-	private final RepositoryMonitor repositoryMonitor = new RepositoryMonitor(this.gitHub,
+	private final RepositoryMonitor repositoryMonitor = new RepositoryMonitor(
 			Arrays.asList(this.repositoryOne, this.repositoryTwo),
-			Arrays.asList(this.issueListenerOne, this.issueListenerTwo));
+			Arrays.asList(this.repositoryListenerOne, this.repositoryListenerTwo));
 
 	@Before
 	public void setUp() {
@@ -60,68 +55,28 @@ public void setUp() {
 	}
 
 	@Test
-	public void repositoriesWithNoIssues() {
-		given(this.gitHub.getIssues("test", "one")).willReturn(null);
-		given(this.gitHub.getIssues("test", "two")).willReturn(null);
-		this.repositoryMonitor.monitor();
-		verifyNoMoreInteractions(this.issueListenerOne, this.issueListenerTwo);
-	}
-
-	@Test
-	public void oneRepositoryWithOpenIssues() {
-		@SuppressWarnings("unchecked")
-		Page<Issue> page = mock(Page.class);
-		Issue issueOne = new Issue(null, null, null, null, null, null, null, null);
-		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null);
-		given(page.getContent()).willReturn(Arrays.asList(issueOne, issueTwo));
-		given(this.gitHub.getIssues("test", "one")).willReturn(page);
-		given(this.gitHub.getIssues("test", "two")).willReturn(null);
-		this.repositoryMonitor.monitor();
-		verify(this.issueListenerOne).onOpenIssue(this.repositoryOne, issueOne);
-		verify(this.issueListenerOne).onOpenIssue(this.repositoryOne, issueTwo);
-		verify(this.issueListenerTwo).onOpenIssue(this.repositoryOne, issueOne);
-		verify(this.issueListenerTwo).onOpenIssue(this.repositoryOne, issueTwo);
+	public void noRepositories() {
+		RepositoryMonitor monitor = new RepositoryMonitor(Collections.emptyList(),
+				Arrays.asList(this.repositoryListenerOne, this.repositoryListenerTwo));
+		monitor.monitor();
+		verifyNoMoreInteractions(repositoryListenerOne, repositoryListenerTwo);
 	}
 
 	@Test
-	public void bothRepositoriesWithOpenIssues() {
-		@SuppressWarnings("unchecked")
-		Page<Issue> page = mock(Page.class);
-		Issue issueOne = new Issue(null, null, null, null, null, null, null, null);
-		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null);
-		given(page.getContent()).willReturn(Arrays.asList(issueOne, issueTwo));
-		given(this.gitHub.getIssues("test", "one")).willReturn(page);
-		given(this.gitHub.getIssues("test", "two")).willReturn(page);
-		this.repositoryMonitor.monitor();
-		verify(this.issueListenerOne).onOpenIssue(this.repositoryOne, issueOne);
-		verify(this.issueListenerOne).onOpenIssue(this.repositoryOne, issueTwo);
-		verify(this.issueListenerTwo).onOpenIssue(this.repositoryOne, issueOne);
-		verify(this.issueListenerTwo).onOpenIssue(this.repositoryOne, issueTwo);
-		verify(this.issueListenerOne).onOpenIssue(this.repositoryTwo, issueOne);
-		verify(this.issueListenerOne).onOpenIssue(this.repositoryTwo, issueTwo);
-		verify(this.issueListenerTwo).onOpenIssue(this.repositoryTwo, issueOne);
-		verify(this.issueListenerTwo).onOpenIssue(this.repositoryTwo, issueTwo);
-	}
-
-	@Test
-	public void exceptionFromAnIssueListenerIsHandledGracefully() {
-		@SuppressWarnings("unchecked")
-		Page<Issue> page = mock(Page.class);
-		Issue issue = new Issue(null, null, null, null, null, null, null, null);
-		given(page.getContent()).willReturn(Arrays.asList(issue));
-		given(this.gitHub.getIssues("test", "one")).willReturn(page);
-		willThrow(new RuntimeException()).given(this.issueListenerOne)
-				.onOpenIssue(this.repositoryOne, issue);
-		this.repositoryMonitor.monitor();
-		verify(this.issueListenerOne).onOpenIssue(this.repositoryOne, issue);
-		verify(this.issueListenerTwo).onOpenIssue(this.repositoryOne, issue);
+	public void noIssueListeners() {
+		RepositoryMonitor monitor = new RepositoryMonitor(
+				Arrays.asList(repositoryOne, repositoryTwo), Collections.emptyList());
+		monitor.monitor();
+		verifyNoMoreInteractions(repositoryListenerTwo, repositoryListenerTwo);
 	}
 
 	@Test
-	public void exceptionFromGitHubIsHandledGracefully() {
-		given(this.gitHub.getIssues("test", "one")).willThrow(new RuntimeException());
+	public void monitorDelegatesToListeners() {
 		this.repositoryMonitor.monitor();
-		verify(this.gitHub).getIssues("test", "one");
+		verify(repositoryListenerOne).handle(repositoryOne);
+		verify(repositoryListenerOne).handle(repositoryTwo);
+		verify(repositoryListenerTwo).handle(repositoryOne);
+		verify(repositoryListenerTwo).handle(repositoryTwo);
 	}
 
 }
diff --git a/src/test/java/io/spring/issuebot/feedback/FeedbackIssueListenerTests.java b/src/test/java/io/spring/issuebot/feedback/FeedbackIssueListenerTests.java
index 937cf70..882c6c9 100644
--- a/src/test/java/io/spring/issuebot/feedback/FeedbackIssueListenerTests.java
+++ b/src/test/java/io/spring/issuebot/feedback/FeedbackIssueListenerTests.java
@@ -66,7 +66,7 @@ public void setUp() {
 	@Test
 	public void issuesWithFeedbackRequiredLabelAreIgnored() {
 		Issue issue = new Issue(null, null, null, null, null,
-				Arrays.asList(new Label("something-else")), null, null);
+				Arrays.asList(new Label("something-else")), null, null, null);
 		this.listener.onOpenIssue(this.repository, issue);
 		verifyNoMoreInteractions(this.gitHub, this.feedbackListener);
 	}
@@ -74,7 +74,7 @@ public void issuesWithFeedbackRequiredLabelAreIgnored() {
 	@Test
 	public void feedbackRequiredForLabeledIssueWithEvent() {
 		Issue issue = new Issue(null, null, null, null, null,
-				Arrays.asList(new Label("required")), null, null);
+				Arrays.asList(new Label("required")), null, null, null);
 		OffsetDateTime requestTime = OffsetDateTime.now();
 		given(this.gitHub.getEvents(issue)).willReturn(new StandardPage<>(
 				Arrays.asList(new Event("labeled", requestTime, new Label("required"))),
@@ -87,7 +87,7 @@ public void feedbackRequiredForLabeledIssueWithEvent() {
 	@Test
 	public void feedbackProvidedAfterCommentFromNonCollaborator() {
 		Issue issue = new Issue("issue_url", null, null, null, null,
-				Arrays.asList(new Label("required")), null, null);
+				Arrays.asList(new Label("required")), null, null, null);
 		OffsetDateTime requestTime = OffsetDateTime.now().minusDays(1);
 		given(this.gitHub.getEvents(issue)).willReturn(new StandardPage<>(
 				Arrays.asList(new Event("labeled", requestTime, new Label("required"))),
@@ -102,7 +102,7 @@ public void feedbackProvidedAfterCommentFromNonCollaborator() {
 	@Test
 	public void feedbackRequiredAfterCommentFromNonCollaboratorBeforeRequest() {
 		Issue issue = new Issue("issue_url", null, null, null, null,
-				Arrays.asList(new Label("required")), null, null);
+				Arrays.asList(new Label("required")), null, null, null);
 		OffsetDateTime requestTime = OffsetDateTime.now().minusDays(1);
 		given(this.gitHub.getEvents(issue)).willReturn(new StandardPage<>(
 				Arrays.asList(new Event("labeled", requestTime, new Label("required"))),
@@ -118,7 +118,7 @@ public void feedbackRequiredAfterCommentFromNonCollaboratorBeforeRequest() {
 	@Test
 	public void feedbackRequiredAfterCommentFromCollaborator() {
 		Issue issue = new Issue(null, null, null, null, null,
-				Arrays.asList(new Label("required")), null, null);
+				Arrays.asList(new Label("required")), null, null, null);
 		OffsetDateTime requestTime = OffsetDateTime.now().minusDays(1);
 		given(this.gitHub.getEvents(issue)).willReturn(new StandardPage<>(
 				Arrays.asList(new Event("labeled", requestTime, new Label("required"))),
@@ -134,7 +134,7 @@ public void feedbackRequiredAfterCommentFromCollaborator() {
 	@Test
 	public void feedbackRequiredAfterCommentFromIssueBot() {
 		Issue issue = new Issue(null, null, null, null, null,
-				Arrays.asList(new Label("required")), null, null);
+				Arrays.asList(new Label("required")), null, null, null);
 		OffsetDateTime requestTime = OffsetDateTime.now().minusDays(1);
 		given(this.gitHub.getEvents(issue)).willReturn(new StandardPage<>(
 				Arrays.asList(new Event("labeled", requestTime, new Label("required"))),
@@ -150,7 +150,7 @@ public void feedbackRequiredAfterCommentFromIssueBot() {
 	@Test
 	public void issueWithNoMatchingLabeledEventIsIgnored() {
 		Issue issue = new Issue(null, null, null, null, null,
-				Arrays.asList(new Label("required")), null, null);
+				Arrays.asList(new Label("required")), null, null, null);
 		OffsetDateTime requestTime = OffsetDateTime.now();
 		given(this.gitHub.getEvents(issue)).willReturn(new StandardPage<>(
 				Arrays.asList(
@@ -163,7 +163,7 @@ public void issueWithNoMatchingLabeledEventIsIgnored() {
 	@Test
 	public void eventsWithWrongTypeAreIgnored() {
 		Issue issue = new Issue(null, null, null, null, null,
-				Arrays.asList(new Label("required")), null, null);
+				Arrays.asList(new Label("required")), null, null, null);
 		OffsetDateTime requestTime = OffsetDateTime.now();
 		given(this.gitHub.getEvents(issue)).willReturn(new StandardPage<>(
 				Arrays.asList(new Event("milestoned", requestTime, null)), () -> null));
diff --git a/src/test/java/io/spring/issuebot/feedback/StandardFeedbackListenerTests.java b/src/test/java/io/spring/issuebot/feedback/StandardFeedbackListenerTests.java
index 9a40198..5f26a80 100644
--- a/src/test/java/io/spring/issuebot/feedback/StandardFeedbackListenerTests.java
+++ b/src/test/java/io/spring/issuebot/feedback/StandardFeedbackListenerTests.java
@@ -49,7 +49,7 @@ public class StandardFeedbackListenerTests {
 			Arrays.asList(this.issueListener));
 
 	private final Issue issue = new Issue(null, null, null, null, null, new ArrayList<>(),
-			null, null);
+			null, null, null);
 
 	private final Issue pullRequest = new Issue(null, null, null, null, null,
 			new ArrayList<>(), null, new PullRequest(null));
diff --git a/src/test/java/io/spring/issuebot/github/ClosedIssuesListenerTest.java b/src/test/java/io/spring/issuebot/github/ClosedIssuesListenerTest.java
new file mode 100644
index 0000000..13f70fa
--- /dev/null
+++ b/src/test/java/io/spring/issuebot/github/ClosedIssuesListenerTest.java
@@ -0,0 +1,89 @@
+package io.spring.issuebot.github;
+
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.willThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+import io.spring.issuebot.IssueMonitor;
+import io.spring.issuebot.IssueListener;
+import io.spring.issuebot.Repository;
+import java.util.Arrays;
+import java.util.Collections;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ClosedIssuesListenerTest {
+
+	private static String waitingForTriageLabel = "status: waiting-for-triage";
+
+	private final GitHubOperations gitHub = mock(GitHubOperations.class);
+
+	private final IssueListener issueListenerOne = mock(IssueListener.class);
+
+	private final IssueListener issueListenerTwo = mock(IssueListener.class);
+
+	private final Repository repositoryOne = new Repository();
+
+	private final IssueMonitor issueMonitor = new IssueMonitor(
+			Arrays.asList(issueListenerOne, issueListenerTwo));
+
+	private ClosedIssuesListener closedIssuesListener = new ClosedIssuesListener(
+			this.gitHub, issueMonitor);
+
+	@Before
+	public void setUp() {
+		this.repositoryOne.setOrganization("test");
+		this.repositoryOne.setName("one");
+	}
+
+	@Test
+	public void repositoriesWithNoIssues() {
+		given(this.gitHub.getClosedIssuesWithLabel("test", "one", waitingForTriageLabel))
+				.willReturn(null);
+		this.closedIssuesListener.handle(repositoryOne);
+		verifyNoMoreInteractions(this.issueListenerOne, this.issueListenerTwo);
+	}
+
+	@Test
+	public void repositoryWithClosedIssues() {
+		@SuppressWarnings("unchecked")
+		Page<Issue> page = mock(Page.class);
+		Issue issueOne = new Issue(null, null, null, null, null, null, null, null,
+				"closed");
+		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null,
+				"closed");
+		given(page.getContent()).willReturn(Arrays.asList(issueOne, issueTwo));
+		given(this.gitHub.getClosedIssuesWithLabel("test", "one", waitingForTriageLabel))
+				.willReturn(page);
+		this.closedIssuesListener.handle(repositoryOne);
+		verify(this.issueListenerOne).onIssueClosure(this.repositoryOne, issueOne);
+		verify(this.issueListenerOne).onIssueClosure(this.repositoryOne, issueOne);
+	}
+
+	@Test
+	public void exceptionFromAnIssueListenerIsHandledGracefully() {
+		@SuppressWarnings("unchecked")
+		Page<Issue> page = mock(Page.class);
+		Issue issue = new Issue(null, null, null, null, null, null, null, null, "closed");
+		given(page.getContent()).willReturn(Collections.singletonList(issue));
+		given(this.gitHub.getClosedIssuesWithLabel("test", "one", waitingForTriageLabel))
+				.willReturn(page);
+		willThrow(new RuntimeException()).given(this.issueListenerOne)
+				.onIssueClosure(this.repositoryOne, issue);
+		this.closedIssuesListener.handle(repositoryOne);
+		verify(this.issueListenerOne).onIssueClosure(this.repositoryOne, issue);
+		verify(this.issueListenerTwo).onIssueClosure(this.repositoryOne, issue);
+	}
+
+	@Test
+	public void exceptionFromGitHubIsHandledGracefully() {
+		given(this.gitHub.getClosedIssuesWithLabel("test", "one", waitingForTriageLabel))
+				.willThrow(new RuntimeException());
+		this.closedIssuesListener.handle(repositoryOne);
+		verify(this.gitHub).getClosedIssuesWithLabel("test", "one",
+				waitingForTriageLabel);
+	}
+
+}
diff --git a/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java b/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java
index 06170b0..3f24e56 100644
--- a/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java
+++ b/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java
@@ -80,6 +80,18 @@ public void singlePageOfIssues() {
 		assertThat(issues.next()).isNull();
 	}
 
+	@Test
+	public void singlePageOfClosedIssues() {
+		this.server.expect(requestTo(
+				"https://api.github.com/repos/org/repo/issues?state=closed&labels=status:%20waiting-for-triage"))
+				.andExpect(method(HttpMethod.GET)).andExpect(basicAuth())
+				.andRespond(withResource("issues-page-one.json"));
+		Page<Issue> issues = this.gitHub.getClosedIssuesWithLabel("org", "repo",
+				"status: waiting-for-triage");
+		assertThat(issues.getContent()).hasSize(15);
+		assertThat(issues.next()).isNull();
+	}
+
 	@Test
 	public void multiplePagesOfIssues() {
 		HttpHeaders headers = new HttpHeaders();
@@ -97,6 +109,25 @@ public void multiplePagesOfIssues() {
 		assertThat(pageTwo.getContent()).hasSize(15);
 	}
 
+	@Test
+	public void multiplePagesOfClosedIssues() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.set("Link", "<page-two>; rel=\"next\"");
+		this.server.expect(requestTo(
+				"https://api.github.com/repos/org/repo/issues?state=closed&labels=status:%20waiting-for-triage"))
+				.andExpect(method(HttpMethod.GET)).andExpect(basicAuth())
+				.andRespond(withResource("issues-page-one.json",
+						"Link:<page-two>; rel=\"next\""));
+		this.server.expect(requestTo("/page-two")).andExpect(method(HttpMethod.GET))
+				.andExpect(basicAuth()).andRespond(withResource("issues-page-two.json"));
+		Page<Issue> pageOne = this.gitHub.getClosedIssuesWithLabel("org", "repo",
+				"status: waiting-for-triage");
+		assertThat(pageOne.getContent()).hasSize(15);
+		Page<Issue> pageTwo = pageOne.next();
+		assertThat(pageTwo).isNotNull();
+		assertThat(pageTwo.getContent()).hasSize(15);
+	}
+
 	@Test
 	public void rateLimited() {
 		long reset = System.currentTimeMillis();
@@ -118,7 +149,7 @@ public void noComments() {
 				.andExpect(basicAuth())
 				.andRespond(withSuccess("[]", MediaType.APPLICATION_JSON));
 		Page<Comment> comments = this.gitHub.getComments(
-				new Issue(null, "commentsUrl", null, null, null, null, null, null));
+				new Issue(null, "commentsUrl", null, null, null, null, null, null, null));
 		assertThat(comments.getContent()).isEmpty();
 		assertThat(comments.next()).isNull();
 	}
@@ -129,7 +160,7 @@ public void singlePageOfComments() {
 				.andExpect(basicAuth())
 				.andRespond(withResource("comments-page-one.json"));
 		Page<Comment> comments = this.gitHub.getComments(
-				new Issue(null, "commentsUrl", null, null, null, null, null, null));
+				new Issue(null, "commentsUrl", null, null, null, null, null, null, null));
 		assertThat(comments.getContent()).hasSize(17);
 		assertThat(comments.next()).isNull();
 	}
@@ -145,7 +176,7 @@ public void multiplePagesOfComments() {
 				.andExpect(basicAuth())
 				.andRespond(withResource("comments-page-two.json"));
 		Page<Comment> pageOne = this.gitHub.getComments(
-				new Issue(null, "commentsUrl", null, null, null, null, null, null));
+				new Issue(null, "commentsUrl", null, null, null, null, null, null, null));
 		assertThat(pageOne.getContent()).hasSize(17);
 		Page<Comment> pageTwo = pageOne.next();
 		assertThat(pageTwo).isNotNull();
@@ -159,7 +190,7 @@ public void addLabelToIssue() {
 				.andRespond(
 						withSuccess("[{\"name\":\"test\"}]", MediaType.APPLICATION_JSON));
 		Issue issue = new Issue("issueUrl", null, null, "labelsUrl{/name}", null, null,
-				null, null);
+				null, null, null);
 		Issue modifiedIssue = this.gitHub.addLabel(issue, "test");
 		assertThat(modifiedIssue.getLabels()).hasSize(1);
 	}
@@ -169,7 +200,7 @@ public void removeLabelFromIssue() {
 		this.server.expect(requestTo("labels/test")).andExpect(method(HttpMethod.DELETE))
 				.andExpect(basicAuth())
 				.andRespond(withSuccess("[]", MediaType.APPLICATION_JSON));
-		Issue issue = new Issue(null, null, null, "labels{/name}", null, null, null,
+		Issue issue = new Issue(null, null, null, "labels{/name}", null, null, null, null,
 				null);
 		Issue modifiedIssue = this.gitHub.removeLabel(issue, "test");
 		assertThat(modifiedIssue.getLabels()).isEmpty();
@@ -180,7 +211,7 @@ public void removeLabelWithNameThatRequiresEncodingFromIssue() {
 		this.server.expect(requestTo("labels/status:%20foo"))
 				.andExpect(method(HttpMethod.DELETE)).andExpect(basicAuth())
 				.andRespond(withSuccess("[]", MediaType.APPLICATION_JSON));
-		Issue issue = new Issue(null, null, null, "labels{/name}", null, null, null,
+		Issue issue = new Issue(null, null, null, "labels{/name}", null, null, null, null,
 				null);
 		Issue modifiedIssue = this.gitHub.removeLabel(issue, "status: foo");
 		assertThat(modifiedIssue.getLabels()).isEmpty();
@@ -192,7 +223,8 @@ public void addCommentToIssue() {
 				.andExpect(basicAuth())
 				.andExpect(content().string("{\"body\":\"A test comment\"}"))
 				.andRespond(withResource("new-comment.json"));
-		Issue issue = new Issue(null, "commentsUrl", null, null, null, null, null, null);
+		Issue issue = new Issue(null, "commentsUrl", null, null, null, null, null, null,
+				null);
 		Comment comment = this.gitHub.addComment(issue, "A test comment");
 		assertThat(comment).isNotNull();
 	}
@@ -202,7 +234,7 @@ public void singlePageOfEvents() {
 		this.server.expect(requestTo("/eventsUrl")).andExpect(method(HttpMethod.GET))
 				.andExpect(basicAuth()).andRespond(withResource("events-page-one.json"));
 		Page<Event> events = this.gitHub.getEvents(
-				new Issue(null, null, "eventsUrl", null, null, null, null, null));
+				new Issue(null, null, "eventsUrl", null, null, null, null, null, null));
 		assertThat(events.getContent()).hasSize(12);
 		assertThat(events.next()).isNull();
 	}
@@ -217,7 +249,7 @@ public void multiplePagesOfEvents() {
 		this.server.expect(requestTo("/page-two")).andExpect(method(HttpMethod.GET))
 				.andExpect(basicAuth()).andRespond(withResource("events-page-two.json"));
 		Page<Event> pageOne = this.gitHub.getEvents(
-				new Issue(null, null, "eventsUrl", null, null, null, null, null));
+				new Issue(null, null, "eventsUrl", null, null, null, null, null, null));
 		assertThat(pageOne.getContent()).hasSize(12);
 		Page<Event> pageTwo = pageOne.next();
 		assertThat(pageTwo).isNotNull();
@@ -231,8 +263,8 @@ public void closeIssue() {
 				.andExpect(content().string("{\"state\":\"closed\"}"))
 				.andRespond(withSuccess("{\"url\":\"updatedIssueUrl\"}",
 						MediaType.APPLICATION_JSON));
-		Issue closedIssue = this.gitHub
-				.close(new Issue("issueUrl", null, null, null, null, null, null, null));
+		Issue closedIssue = this.gitHub.close(
+				new Issue("issueUrl", null, null, null, null, null, null, null, null));
 		assertThat(closedIssue.getUrl()).isEqualTo("updatedIssueUrl");
 	}
 
diff --git a/src/test/java/io/spring/issuebot/github/OpenIssuesListenerTest.java b/src/test/java/io/spring/issuebot/github/OpenIssuesListenerTest.java
new file mode 100644
index 0000000..9124350
--- /dev/null
+++ b/src/test/java/io/spring/issuebot/github/OpenIssuesListenerTest.java
@@ -0,0 +1,82 @@
+package io.spring.issuebot.github;
+
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.willThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+import io.spring.issuebot.IssueMonitor;
+import io.spring.issuebot.IssueListener;
+import io.spring.issuebot.Repository;
+import java.util.Arrays;
+import java.util.Collections;
+import org.junit.Before;
+import org.junit.Test;
+
+public class OpenIssuesListenerTest {
+
+	private final GitHubOperations gitHub = mock(GitHubOperations.class);
+
+	private final IssueListener issueListenerOne = mock(IssueListener.class);
+
+	private final IssueListener issueListenerTwo = mock(IssueListener.class);
+
+	private final Repository repositoryOne = new Repository();
+
+	private final IssueMonitor issueMonitor = new IssueMonitor(
+			Arrays.asList(issueListenerOne, issueListenerTwo));
+
+	private OpenIssuesListener openIssuesListener = new OpenIssuesListener(this.gitHub,
+			issueMonitor);
+
+	@Before
+	public void setUp() {
+		this.repositoryOne.setOrganization("test");
+		this.repositoryOne.setName("one");
+	}
+
+	@Test
+	public void repositoriesWithNoIssues() {
+		given(this.gitHub.getIssues("test", "one")).willReturn(null);
+		this.openIssuesListener.handle(repositoryOne);
+		verifyNoMoreInteractions(this.issueListenerOne, this.issueListenerTwo);
+	}
+
+	@Test
+	public void repositoryWithIssues() {
+		@SuppressWarnings("unchecked")
+		Page<Issue> page = mock(Page.class);
+		Issue issueOne = new Issue(null, null, null, null, null, null, null, null,
+				"open");
+		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null,
+				"open");
+		given(page.getContent()).willReturn(Arrays.asList(issueOne, issueTwo));
+		given(this.gitHub.getIssues("test", "one")).willReturn(page);
+		this.openIssuesListener.handle(repositoryOne);
+		verify(this.issueListenerOne).onOpenIssue(this.repositoryOne, issueOne);
+		verify(this.issueListenerOne).onOpenIssue(this.repositoryOne, issueOne);
+	}
+
+	@Test
+	public void exceptionFromAnIssueListenerIsHandledGracefully() {
+		@SuppressWarnings("unchecked")
+		Page<Issue> page = mock(Page.class);
+		Issue issue = new Issue(null, null, null, null, null, null, null, null, "open");
+		given(page.getContent()).willReturn(Collections.singletonList(issue));
+		given(this.gitHub.getIssues("test", "one")).willReturn(page);
+		willThrow(new RuntimeException()).given(this.issueListenerOne)
+				.onOpenIssue(this.repositoryOne, issue);
+		this.openIssuesListener.handle(repositoryOne);
+		verify(this.issueListenerOne).onOpenIssue(this.repositoryOne, issue);
+		verify(this.issueListenerTwo).onOpenIssue(this.repositoryOne, issue);
+	}
+
+	@Test
+	public void exceptionFromGitHubIsHandledGracefully() {
+		given(this.gitHub.getIssues("test", "one")).willThrow(new RuntimeException());
+		this.openIssuesListener.handle(repositoryOne);
+		verify(this.gitHub).getIssues("test", "one");
+	}
+
+}
diff --git a/src/test/java/io/spring/issuebot/triage/LabelApplyingTriageListenerTests.java b/src/test/java/io/spring/issuebot/triage/LabelApplyingTriageListenerTests.java
index de95e3c..37cac8d 100644
--- a/src/test/java/io/spring/issuebot/triage/LabelApplyingTriageListenerTests.java
+++ b/src/test/java/io/spring/issuebot/triage/LabelApplyingTriageListenerTests.java
@@ -37,9 +37,16 @@ public class LabelApplyingTriageListenerTests {
 
 	@Test
 	public void requiresTriage() {
-		Issue issue = new Issue(null, null, null, null, null, null, null, null);
+		Issue issue = new Issue(null, null, null, null, null, null, null, null, null);
 		this.listener.requiresTriage(issue);
 		verify(this.gitHub).addLabel(issue, "test");
 	}
 
+	@Test
+	public void doesNotRequireTriage() {
+		Issue issue = new Issue(null, null, null, null, null, null, null, null, null);
+		this.listener.doesNotRequireTriage(issue);
+		verify(this.gitHub).removeLabel(issue, "test");
+	}
+
 }
diff --git a/src/test/java/io/spring/issuebot/triage/LabelledTriageFilterTests.java b/src/test/java/io/spring/issuebot/triage/LabelledTriageFilterTests.java
index f5c3fea..292646d 100644
--- a/src/test/java/io/spring/issuebot/triage/LabelledTriageFilterTests.java
+++ b/src/test/java/io/spring/issuebot/triage/LabelledTriageFilterTests.java
@@ -39,20 +39,24 @@ public class LabelledTriageFilterTests {
 
 	@Test
 	public void issueWithLabels() {
-		assertThat(this.filter.triaged(this.repository, new Issue(null, null, null, null,
-				null, Arrays.asList(new Label("test")), null, null))).isTrue();
+		assertThat(
+				this.filter.triaged(this.repository,
+						new Issue(null, null, null, null, null,
+								Arrays.asList(new Label("test")), null, null, null)))
+										.isTrue();
 	}
 
 	@Test
 	public void issueWithNullLabels() {
 		assertThat(this.filter.triaged(this.repository,
-				new Issue(null, null, null, null, null, null, null, null))).isFalse();
+				new Issue(null, null, null, null, null, null, null, null, null)))
+						.isFalse();
 	}
 
 	@Test
 	public void issueWithNoLabels() {
 		assertThat(this.filter.triaged(this.repository, new Issue(null, null, null, null,
-				null, Collections.emptyList(), null, null))).isFalse();
+				null, Collections.emptyList(), null, null, null))).isFalse();
 	}
 
 }
diff --git a/src/test/java/io/spring/issuebot/triage/MilestoneAppliedTriageFilterTests.java b/src/test/java/io/spring/issuebot/triage/MilestoneAppliedTriageFilterTests.java
index e3bdc17..0eea78a 100644
--- a/src/test/java/io/spring/issuebot/triage/MilestoneAppliedTriageFilterTests.java
+++ b/src/test/java/io/spring/issuebot/triage/MilestoneAppliedTriageFilterTests.java
@@ -37,13 +37,14 @@ public class MilestoneAppliedTriageFilterTests {
 	@Test
 	public void issueWithMilestoneApplied() {
 		assertThat(this.filter.triaged(this.repository, new Issue(null, null, null, null,
-				null, null, new Milestone("test"), null))).isTrue();
+				null, null, new Milestone("test"), null, null))).isTrue();
 	}
 
 	@Test
 	public void issueWithNoMilestoneApplied() {
 		assertThat(this.filter.triaged(this.repository,
-				new Issue(null, null, null, null, null, null, null, null))).isFalse();
+				new Issue(null, null, null, null, null, null, null, null, null)))
+						.isFalse();
 	}
 
 }
diff --git a/src/test/java/io/spring/issuebot/triage/OpenedByCollaboratorTriageFilterTests.java b/src/test/java/io/spring/issuebot/triage/OpenedByCollaboratorTriageFilterTests.java
index 166ff4b..4f3782a 100644
--- a/src/test/java/io/spring/issuebot/triage/OpenedByCollaboratorTriageFilterTests.java
+++ b/src/test/java/io/spring/issuebot/triage/OpenedByCollaboratorTriageFilterTests.java
@@ -46,16 +46,14 @@ public void setUp() {
 
 	@Test
 	public void openedByCollaborator() {
-		assertThat(this.filter.triaged(this.repository,
-				new Issue(null, null, null, null, new User("Alice"), null, null, null)))
-						.isTrue();
+		assertThat(this.filter.triaged(this.repository, new Issue(null, null, null, null,
+				new User("Alice"), null, null, null, null))).isTrue();
 	}
 
 	@Test
 	public void openedByAnotherUser() {
-		assertThat(this.filter.triaged(this.repository,
-				new Issue(null, null, null, null, new User("Debbie"), null, null, null)))
-						.isFalse();
+		assertThat(this.filter.triaged(this.repository, new Issue(null, null, null, null,
+				new User("Debbie"), null, null, null, null))).isFalse();
 	}
 
 }
diff --git a/src/test/java/io/spring/issuebot/triage/TriageIssueListenerTests.java b/src/test/java/io/spring/issuebot/triage/TriageIssueListenerTests.java
index e82b9c2..27da34b 100644
--- a/src/test/java/io/spring/issuebot/triage/TriageIssueListenerTests.java
+++ b/src/test/java/io/spring/issuebot/triage/TriageIssueListenerTests.java
@@ -48,7 +48,7 @@ public class TriageIssueListenerTests {
 
 	@Test
 	public void listenerIsCalledWhenIssueRequiresTriage() {
-		Issue issue = new Issue(null, null, null, null, null, null, null, null);
+		Issue issue = new Issue(null, null, null, null, null, null, null, null, null);
 		given(this.triageFilterOne.triaged(this.repository, issue)).willReturn(false);
 		given(this.triageFilterTwo.triaged(this.repository, issue)).willReturn(false);
 		this.issueListener.onOpenIssue(this.repository, issue);
@@ -57,9 +57,18 @@ public void listenerIsCalledWhenIssueRequiresTriage() {
 		verify(this.listener).requiresTriage(issue);
 	}
 
+	@Test
+	public void listenerIsCalledWhenClosedIssueRequiresTriage() {
+		Issue issue = new Issue(null, null, null, null, null, null, null, null, null);
+		given(this.triageFilterOne.triaged(this.repository, issue)).willReturn(false);
+		given(this.triageFilterTwo.triaged(this.repository, issue)).willReturn(false);
+		this.issueListener.onIssueClosure(this.repository, issue);
+		verify(this.listener).doesNotRequireTriage(issue);
+	}
+
 	@Test
 	public void listenerIsNotCalledWhenIssueHasAlreadyBeenTriaged() {
-		Issue issue = new Issue(null, null, null, null, null, null, null, null);
+		Issue issue = new Issue(null, null, null, null, null, null, null, null, null);
 		given(this.triageFilterOne.triaged(this.repository, issue)).willReturn(true);
 		this.issueListener.onOpenIssue(this.repository, issue);
 		verify(this.triageFilterOne).triaged(this.repository, issue);