diff --git a/hashmail_server_test.go b/hashmail_server_test.go
index d4a4848..79909d4 100644
--- a/hashmail_server_test.go
+++ b/hashmail_server_test.go
@@ -188,6 +188,10 @@ func setupAperture(t *testing.T) {
 	errChan := make(chan error)
 	shutdown := make(chan struct{})
 	require.NoError(t, aperture.Start(errChan, shutdown))
+	t.Cleanup(func() {
+		close(shutdown)
+		require.NoError(t, aperture.Stop())
+	})
 
 	// Any error while starting?
 	select {